diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index aaf108d455d0..fa11a253200d 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -319,6 +319,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Release elasticsearch module and all its metricsets as beta. {pull}7662[7662] - Release munin and traefik module as beta. {pull}7660[7660] - Add envoyproxy module. {pull}7569[7569] +- Release prometheus collector metricset as GA. {pull}7660[7660] *Packetbeat* diff --git a/metricbeat/docs/modules/prometheus.asciidoc b/metricbeat/docs/modules/prometheus.asciidoc index cada7468f0d0..4d0d5f59fbcb 100644 --- a/metricbeat/docs/modules/prometheus.asciidoc +++ b/metricbeat/docs/modules/prometheus.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-prometheus]] == Prometheus module -beta[] - This module periodically fetches metrics from https://prometheus.io/docs/[Prometheus]. diff --git a/metricbeat/docs/modules/prometheus/collector.asciidoc b/metricbeat/docs/modules/prometheus/collector.asciidoc index c97efda51287..6ba85fbcd013 100644 --- a/metricbeat/docs/modules/prometheus/collector.asciidoc +++ b/metricbeat/docs/modules/prometheus/collector.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-prometheus-collector]] === Prometheus collector metricset -beta[] - include::../../../module/prometheus/collector/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 3c129a04b1db..98dcb24ea395 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -105,8 +105,8 @@ This file is generated! See scripts/docs_collector.py |<> |<> |<> beta[] -|<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | -.2+| .2+| |<> beta[] +|<> |image:./images/icon-no.png[No prebuilt dashboards] | +.2+| .2+| |<> |<> beta[] |<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | .4+| .4+| |<> beta[] diff --git a/metricbeat/module/prometheus/_meta/fields.yml b/metricbeat/module/prometheus/_meta/fields.yml index ef8c42863095..3afbb1c36048 100644 --- a/metricbeat/module/prometheus/_meta/fields.yml +++ b/metricbeat/module/prometheus/_meta/fields.yml @@ -3,7 +3,7 @@ description: > Stats collected from Prometheus. short_config: false - release: beta + release: ga settings: ["ssl"] fields: - name: prometheus diff --git a/metricbeat/module/prometheus/collector/_meta/fields.yml b/metricbeat/module/prometheus/collector/_meta/fields.yml index 8033a27f5ac5..a927f3fc9f84 100644 --- a/metricbeat/module/prometheus/collector/_meta/fields.yml +++ b/metricbeat/module/prometheus/collector/_meta/fields.yml @@ -1 +1 @@ -- release: beta +- release: ga diff --git a/metricbeat/module/prometheus/fields.go b/metricbeat/module/prometheus/fields.go index eee7a27def7b..74c697389b37 100644 --- a/metricbeat/module/prometheus/fields.go +++ b/metricbeat/module/prometheus/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJy0krGOm0AQhnue4pf74wEo0qQ/RUoZRdYafmDlZYfMDCf57SOC7eM4LDe5KYd/5/uY3Receakwqgz0npMVgEdPrHD4cW8eCqCh1RpHj5IrfCsA4KcHN9SSEmtng1ZlwPupsgCsF/VjLbmNXYU2JGMBKBODscKJHuYU3WPurMKvg1k6/C6ANjI1Vv0DvSCHgRvNufwyskKnMo3Xzo7mx1nLvK3Brb9wbP6xe3cP8xC11LKZcJLJ4T1XS4FR36jlKr7v8tl6bZjFYxvrMMPtQ+KR7RPjuV5XQ5cdlJvMntJa68/EicfE3Hn/KXQzS5K7nY9P5Ob6Pqky+4LBgtkqvss0KuPI5gs8XqfhRIW0N8bViG/M26Wt3m5NM1opI/OxbfavbUfq2a3dZebBaGPi/YjoAxtz0dCxrPspn+3ochypFs3/u9TAQfSCBQTvgyMo5weMCx1XLBu4oIl2Lou/AQAA//+M7D0A" + return "eJy0ksGumzAQRfd8xVX2jw9g0U33T5W6rCrkwAWsGA/1DE/K31cuCY9QomzaWQ7jew5jv+HCa4UpyUgbOGsBmLfACqdva/NUAC21SX4yL7HClwIAvpszRSMhsDG26JKM+DxVFoAOkqxuJHa+r9C5oCyAxECnrNC7PEMzH3ut8OOkGk4/C6DzDK1WfzBviG7kTjKXXaeckWSebp0DycesJe+Rf+8uFM0/tXaPIE9BSy1bcWeZDTZwsxAo0wdTuRlfTc40t+nvnbeGUcx3vnEZrg8Tz2xfGOd634QuOyh3M0dKW61fM2fWgbG34a+hu1mQ2B98fCGX6+ucEqMtGCyYveKnTJtkmtj+B4/3eTwzQbo742bED8b90jYvt6EqtZSJse7a42s7kHp1a6tMDkbnA9cjkp7YqElyPctmmONFa5N6YlKv9s+lRo6SrlhAsMEZXGJ+wLjScMOyhQlar5ey+B0AAP//Qe07WA==" }