Skip to content

Commit

Permalink
[Heartbeat] Remove default config dashboard refs (elastic#12769)
Browse files Browse the repository at this point in the history
* [Heartbeat] Remove default config dashboard refs

Heartbeat hasn't supported the dashboard commands for a while.
This patch removes the config references.

Fixes elastic#11802

* Fix missing vars

(cherry picked from commit e21512d)
  • Loading branch information
andrewvc committed Jul 23, 2019
1 parent ef344e2 commit 83f407f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
1 change: 1 addition & 0 deletions dev-tools/mage/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ func Config(types ConfigFileType, args ConfigFileParams, targetDir string) error
"ExcludeLogstash": false,
"ExcludeRedis": false,
"UseObserverProcessor": false,
"ExcludeDashboards": false,
}
for k, v := range args.ExtraVars {
params[k] = v
Expand Down
12 changes: 0 additions & 12 deletions heartbeat/heartbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,6 @@ setup.template.settings:
# env: staging


#============================== Dashboards =====================================
# These settings control loading the sample dashboards to the Kibana index. Loading
# the dashboards is disabled by default and can be enabled either by setting the
# options here or by using the `setup` command.
#setup.dashboards.enabled: false

# The URL from where to download the dashboards archive. By default this URL
# has a value which is computed based on the Beat name and version. For released
# versions, this URL points to the dashboard archive on the artifacts.elastic.co
# website.
#setup.dashboards.url:

#============================== Kibana =====================================

# Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
Expand Down
1 change: 1 addition & 0 deletions heartbeat/scripts/mage/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func ConfigFileParams() devtools.ConfigFileParams {
},
ExtraVars: map[string]interface{}{
"UseObserverProcessor": true,
"ExcludeDashboards": true,
},
}
}
4 changes: 2 additions & 2 deletions libbeat/_meta/config.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#fields:
# env: staging


{{if not .ExcludeDashboards }}
#============================== Dashboards =====================================
# These settings control loading the sample dashboards to the Kibana index. Loading
# the dashboards is disabled by default and can be enabled either by setting the
Expand All @@ -26,7 +26,7 @@
# versions, this URL points to the dashboard archive on the artifacts.elastic.co
# website.
#setup.dashboards.url:

{{end}}
#============================== Kibana =====================================

# Starting with Beats version 6.0.0, the dashboards are loaded via the Kibana API.
Expand Down

0 comments on commit 83f407f

Please sign in to comment.