Skip to content

Commit 1ff5c49

Browse files
consulthysconsulthys
authored
[Stack Monitoring] Remove kibana.settings metricset (#42937)
* Remove kibana.settings metricset
1 parent 0ea31fd commit 1ff5c49

18 files changed

Lines changed: 3 additions & 759 deletions

‎CHANGELOG.next.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ otherwise no tag is added. {issue}42208[42208] {pull}42403[42403]
8181
- Add GCP organization and project details to ECS cloud fields. {pull}40461[40461]
8282
- Add support for specifying a custom endpoint for GCP service clients. {issue}40848[40848] {pull}40918[40918]
8383
- Fix incorrect handling of types in SQL module. {issue}40090[40090] {pull}41607[41607]
84+
- Remove kibana.settings metricset since the API was removed in 8.0 {issue}30592[30592] {pull}42937[42937]
8485

8586
*Osquerybeat*
8687

‎metricbeat/docs/fields.asciidoc‎

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -44787,99 +44787,6 @@ type: long
4478744787

4478844788
--
4478944789

44790-
[float]
44791-
=== settings
44792-
44793-
Kibana stats and run-time metrics.
44794-
44795-
44796-
44797-
*`kibana.settings.uuid`*::
44798-
+
44799-
--
44800-
Kibana instance UUID
44801-
44802-
type: keyword
44803-
44804-
--
44805-
44806-
*`kibana.settings.name`*::
44807-
+
44808-
--
44809-
Kibana instance name
44810-
44811-
type: keyword
44812-
44813-
--
44814-
44815-
*`kibana.settings.index`*::
44816-
+
44817-
--
44818-
Name of Kibana's internal index
44819-
44820-
type: keyword
44821-
44822-
--
44823-
44824-
*`kibana.settings.host`*::
44825-
+
44826-
--
44827-
Kibana instance hostname
44828-
44829-
type: keyword
44830-
44831-
--
44832-
44833-
*`kibana.settings.transport_address`*::
44834-
+
44835-
--
44836-
Kibana server's hostname and port
44837-
44838-
type: keyword
44839-
44840-
--
44841-
44842-
*`kibana.settings.version`*::
44843-
+
44844-
--
44845-
Kibana version
44846-
44847-
type: keyword
44848-
44849-
--
44850-
44851-
*`kibana.settings.snapshot`*::
44852-
+
44853-
--
44854-
Whether the Kibana build is a snapshot build
44855-
44856-
type: boolean
44857-
44858-
--
44859-
44860-
*`kibana.settings.status`*::
44861-
+
44862-
--
44863-
Kibana instance's health status
44864-
44865-
type: keyword
44866-
44867-
--
44868-
44869-
*`kibana.settings.locale`*::
44870-
+
44871-
--
44872-
type: keyword
44873-
44874-
--
44875-
44876-
*`kibana.settings.port`*::
44877-
+
44878-
--
44879-
type: integer
44880-
44881-
--
44882-
4488344790
[float]
4488444791
=== stats
4488544792

‎metricbeat/docs/modules/kibana.asciidoc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ The following metricsets are available:
7676

7777
* <<metricbeat-metricset-kibana-node_rules,node_rules>>
7878

79-
* <<metricbeat-metricset-kibana-settings,settings>>
80-
8179
* <<metricbeat-metricset-kibana-stats,stats>>
8280

8381
* <<metricbeat-metricset-kibana-status,status>>
@@ -90,8 +88,6 @@ include::kibana/node_actions.asciidoc[]
9088

9189
include::kibana/node_rules.asciidoc[]
9290

93-
include::kibana/settings.asciidoc[]
94-
9591
include::kibana/stats.asciidoc[]
9692

9793
include::kibana/status.asciidoc[]

‎metricbeat/docs/modules/kibana/settings.asciidoc‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎metricbeat/docs/modules_list.asciidoc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,10 @@ This file is generated! See scripts/mage/docs_collector.go
168168
|<<metricbeat-metricset-kafka-partition,partition>>
169169
|<<metricbeat-metricset-kafka-producer,producer>> beta[]
170170
|<<metricbeat-module-kibana,Kibana>> |image:./images/icon-no.png[No prebuilt dashboards] |
171-
.7+| .7+| |<<metricbeat-metricset-kibana-cluster_actions,cluster_actions>> beta[]
171+
.6+| .6+| |<<metricbeat-metricset-kibana-cluster_actions,cluster_actions>> beta[]
172172
|<<metricbeat-metricset-kibana-cluster_rules,cluster_rules>> beta[]
173173
|<<metricbeat-metricset-kibana-node_actions,node_actions>> beta[]
174174
|<<metricbeat-metricset-kibana-node_rules,node_rules>> beta[]
175-
|<<metricbeat-metricset-kibana-settings,settings>>
176175
|<<metricbeat-metricset-kibana-stats,stats>>
177176
|<<metricbeat-metricset-kibana-status,status>>
178177
|<<metricbeat-module-kubernetes,Kubernetes>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |

‎metricbeat/include/list_common.go‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎metricbeat/module/kibana/_meta/README.md‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77

88
Metricbeat will call the following Kibana API endpoints corresponding to each metricset.
99

10-
### settings
11-
12-
- `/api/settings`
13-
- [mb exported fields](https://www.elastic.co/guide/en/beats/metricbeat/current/exported-fields-kibana.html#_settings_2)
14-
15-
This endpoint provides some basic information about the Kibana instance and how it's configured (uuids, local settings, status).
16-
17-
The endpoint was removed from kibana in 8.0.0-beta1 ([changelog](https://www.elastic.co/guide/en/kibana/master/release-notes-8.0.0-beta1.html#rest-api-breaking-changes-8.0.0-beta1)) but the metricset can still be used on older kibana versions.
18-
1910
### stats [xpack]
2011

2112
- `/api/stats`

‎metricbeat/module/kibana/fields.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎metricbeat/module/kibana/kibana.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,10 @@ const (
4343
NodeRulesPath = "api/monitoring_collection/node_rules"
4444
ClusterActionsPath = "api/monitoring_collection/cluster_actions"
4545
NodeActionsPath = "api/monitoring_collection/node_actions"
46-
SettingsPath = "api/settings"
4746
)
4847

4948
var (
5049
v6_4_0 = version.MustNew("6.4.0")
51-
v6_5_0 = version.MustNew("6.5.0")
5250
v6_7_2 = version.MustNew("6.7.2")
5351
v7_0_0 = version.MustNew("7.0.0")
5452
v7_0_1 = version.MustNew("7.0.1")
@@ -57,9 +55,6 @@ var (
5755
// StatsAPIAvailableVersion is the version of Kibana since when the stats API is available
5856
StatsAPIAvailableVersion = v6_4_0
5957

60-
// SettingsAPIAvailableVersion is the version of Kibana since when the settings API is available
61-
SettingsAPIAvailableVersion = v6_5_0
62-
6358
// Version of Kibana since when the rules and task manager APIs are available
6459
RulesAPIAvailableVersion = v8_2_0
6560
ActionsAPIAvailableVersion = v8_2_0
@@ -121,11 +116,6 @@ func IsStatsAPIAvailable(currentKibanaVersion *version.V) bool {
121116
return elastic.IsFeatureAvailable(currentKibanaVersion, StatsAPIAvailableVersion)
122117
}
123118

124-
// IsSettingsAPIAvailable returns whether the settings API is available in the given version of Kibana
125-
func IsSettingsAPIAvailable(currentKibanaVersion *version.V) bool {
126-
return elastic.IsFeatureAvailable(currentKibanaVersion, SettingsAPIAvailableVersion)
127-
}
128-
129119
// IsRulesAPIAvailable returns whether the rules API is available in the given version of Kibana
130120
func IsRulesAPIAvailable(currentKibanaVersion *version.V) bool {
131121
return elastic.IsFeatureAvailable(currentKibanaVersion, RulesAPIAvailableVersion)

‎metricbeat/module/kibana/settings/_meta/data.json‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)