From 6238cf2d013cb541380ae9e8d0484c2b0d2b6dbe Mon Sep 17 00:00:00 2001 From: Mario Castro Date: Tue, 24 Mar 2020 14:17:18 +0100 Subject: [PATCH] [Metricbeat] Make Oracle module GA (#16833) (cherry picked from commit 8a2ed7660482d6e9a12fd6e1dd23db9fe79aafc4) # Conflicts: # Jenkinsfile --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/modules/oracle.asciidoc | 2 -- metricbeat/docs/modules/oracle/performance.asciidoc | 2 -- metricbeat/docs/modules/oracle/tablespace.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 6 +++--- x-pack/metricbeat/module/oracle/_meta/Dockerfile | 4 ++-- x-pack/metricbeat/module/oracle/_meta/fields.yml | 2 +- .../module/oracle/_meta/supported-versions.yml | 2 ++ x-pack/metricbeat/module/oracle/docker-compose.yml | 12 ++++++++++++ x-pack/metricbeat/module/oracle/fields.go | 2 +- .../module/oracle/performance/_meta/fields.yml | 2 +- .../module/oracle/performance/metricset.go | 3 --- .../module/oracle/tablespace/_meta/fields.yml | 2 +- .../metricbeat/module/oracle/tablespace/metricset.go | 3 --- 14 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 x-pack/metricbeat/module/oracle/_meta/supported-versions.yml create mode 100644 x-pack/metricbeat/module/oracle/docker-compose.yml diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index fc6f577722b..5a4498e5506 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -340,6 +340,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add support for CouchDB v2 {issue}16352[16352] {pull}16455[16455] - Release Zookeeper/connection module as GA. {issue}14281[14281] {pull}17043[17043] - Replace vpc metricset into vpn, transitgateway and natgateway metricsets. {pull}16892[16892] +- Release Oracle module as GA. {issue}14279[14279] {pull}16833[16833] *Packetbeat* diff --git a/metricbeat/docs/modules/oracle.asciidoc b/metricbeat/docs/modules/oracle.asciidoc index 9cab2b41848..d56abf8648b 100644 --- a/metricbeat/docs/modules/oracle.asciidoc +++ b/metricbeat/docs/modules/oracle.asciidoc @@ -6,8 +6,6 @@ This file is generated! See scripts/mage/docs_collector.go [role="xpack"] == Oracle module -beta[] - This is the https://www.oracle.com[Oracle] module for Metricbeat. It is under active development with feedback from the community. A single Metricset for Tablespace monitoring is added so the community can start gathering metrics from their nodes and contributing to the module. [float] diff --git a/metricbeat/docs/modules/oracle/performance.asciidoc b/metricbeat/docs/modules/oracle/performance.asciidoc index 39fe10002fc..2c57d8f6202 100644 --- a/metricbeat/docs/modules/oracle/performance.asciidoc +++ b/metricbeat/docs/modules/oracle/performance.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-oracle-performance]] === Oracle performance metricset -beta[] - include::../../../../x-pack/metricbeat/module/oracle/performance/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/oracle/tablespace.asciidoc b/metricbeat/docs/modules/oracle/tablespace.asciidoc index 4e498244fea..af25323b220 100644 --- a/metricbeat/docs/modules/oracle/tablespace.asciidoc +++ b/metricbeat/docs/modules/oracle/tablespace.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-oracle-tablespace]] === Oracle tablespace metricset -beta[] - include::../../../../x-pack/metricbeat/module/oracle/tablespace/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 1e47de30d06..2bc7fa47acf 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -194,9 +194,9 @@ This file is generated! See scripts/mage/docs_collector.go .1+| .1+| |<> |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> beta[] -|<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.2+| .2+| |<> beta[] -|<> beta[] +|<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | +.2+| .2+| |<> +|<> |<> |image:./images/icon-no.png[No prebuilt dashboards] | .2+| .2+| |<> |<> diff --git a/x-pack/metricbeat/module/oracle/_meta/Dockerfile b/x-pack/metricbeat/module/oracle/_meta/Dockerfile index 4beaff0b853..7bea9aaf3a0 100644 --- a/x-pack/metricbeat/module/oracle/_meta/Dockerfile +++ b/x-pack/metricbeat/module/oracle/_meta/Dockerfile @@ -1,3 +1,3 @@ -FROM store/oracle/database-enterprise:12.2.0.1 +FROM docker.elastic.co/observability-ci/database-enterprise:12.2.0.1 -HEALTHCHECK --interval=1s --retries=90 CMD /usr/bin/echo 'select 1' | sqlplus sys/Oradoc_db1@localhost:1521/ORCLPDB1.localdomain AS SYSDBA +HEALTHCHECK --interval=1s --retries=90 CMD /usr/bin/echo 'select 1' | /u01/app/oracle/product/12.2.0/dbhome_1/bin/sqlplus sys/Oradoc_db1@localhost:1521/ORCLPDB1.localdomain AS SYSDBA diff --git a/x-pack/metricbeat/module/oracle/_meta/fields.yml b/x-pack/metricbeat/module/oracle/_meta/fields.yml index 7fdcea65004..8a4f8cbd629 100644 --- a/x-pack/metricbeat/module/oracle/_meta/fields.yml +++ b/x-pack/metricbeat/module/oracle/_meta/fields.yml @@ -2,7 +2,7 @@ title: "Oracle" description: Oracle database module short_config: false - release: beta + release: ga fields: - name: oracle type: group diff --git a/x-pack/metricbeat/module/oracle/_meta/supported-versions.yml b/x-pack/metricbeat/module/oracle/_meta/supported-versions.yml new file mode 100644 index 00000000000..2e587a42b7f --- /dev/null +++ b/x-pack/metricbeat/module/oracle/_meta/supported-versions.yml @@ -0,0 +1,2 @@ +variants: + - ORACLE_VERSION: 12.2.0.1 diff --git a/x-pack/metricbeat/module/oracle/docker-compose.yml b/x-pack/metricbeat/module/oracle/docker-compose.yml new file mode 100644 index 00000000000..1b6845a9da5 --- /dev/null +++ b/x-pack/metricbeat/module/oracle/docker-compose.yml @@ -0,0 +1,12 @@ +version: '2.3' + +services: + oracle: + image: docker.elastic.co/observability-ci/database-enterprise:${ORACLE_VERSION:-12.2.0.1}-1 + build: + context: ./_meta + args: + ORACLE_VERSION: ${ORACLE_VERSION:-12.2.0.1} + ports: + - 1521 + - 5500 diff --git a/x-pack/metricbeat/module/oracle/fields.go b/x-pack/metricbeat/module/oracle/fields.go index b5908686ae9..ba6dcbed849 100644 --- a/x-pack/metricbeat/module/oracle/fields.go +++ b/x-pack/metricbeat/module/oracle/fields.go @@ -19,5 +19,5 @@ func init() { // AssetOracle returns asset data. // This is the base64 encoded gzipped contents of module/oracle. func AssetOracle() string { - return "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" + return "eJzEWE1v2zgTvudXDHJxC7ju3YcXSNvk3QBpnE2CAnsyxuLI4oYiVZKK4/76xVAfli3KsesgzaWuJM4888w3P8ETradgLCaKzgC89IqmcD4LD87PAAS5xMrCS6OnUD0GgR4X6AhyI8pwzmXG+nlidCqXU0hROX5qSRE6msISzwBSSUq46RkAwCfQmFNHMf/5dcHfWlMW9ZOY8lYn/3VlduUWZFNjc9QJte9iCnpK7jYHGT56EpCTtzJxYDQgOKmXXQqkdn5HzbbZzd8u1C7cHJNMatp618B9ovXKWLHzbpuZgix6qZfg1s5T3sgL0qMKF2Wakp0XxqjfVXqLOYFJwWdUiwMWB1KHRxFeNupLR7aH7RiDq1CIiml0SDO3pAwKF9UiTLlQuwC2lNxXp+Ez3EntgBk2E7ion4N0gHoNd9e3zAJqMIt/KfHgM/T8UhsfiEildT58VgclCQ6ihMLb+lCGWiiCFTpILHHUjQG1gFUmkwws/SylJQesmN3cOZlak4OQ7mlSwURbCdZlviAbHCRzcoABAitgaeQ4sFNjazGu8iTDxpxcgQOOUyZ5mtcC4rwqo5f7WL14JovLNnICq7AgvyLSMFqSz6R3o2A8/8+NYEFs8uj/zauodQ39I9flMjWlFhyROeXGrrtS4xyxfceQNImyVEi9n6TXg69DEyrFEtn4z0Ubia7h5U7qv4Z5UaphOiePXLWgkJSQax4rubBo1004rchSnDZWPUTbW4RWgkkWLwi7BbtH1oNHL53nGo0LU/pgdqcmOcBnlAoXigKwwfoUr9LQK5yTTPpJkfjeZ3sd3MP9mFFlNmTS16lQu8UVlMhUkujaMRmEVWRrJxNUc0v9ggf7krMH6q4WBXFRjcYlDVsfc1hPz5dOz+CcHIFr3Rg5O+SYLqbEaCedJx2D9ioLPYRfW3Fsrdvg2wtCLOYLLiMxI47H8K2ZMyqZsDTek44nUGmdsfGC82oKfa0Og9Rh/OGHR2YGPscMOiYdmppXGwKmIM0JsG4bfahE8WGpO0y9nAjkO76cCsIbj7uj1bEwHllGA6DBcyyQ6vhpqTrbhrAvDw5K09Lat8rRiqNNR6plB7MHMmIbzJCj3gRKN4I2M1/TephI6yPOaas6WheLkiNcd8ciOi7rJng1qpokKS2JZm5vCHTkXL8IwIEutvRGpJ7f0xapRWXPBrklMW3A1pRveqqDT9UJSEypPXwI3v54/ociooaCSjn4kKEVIYOdSf1HXiz4R/0NLxeQZJQ8ha2zXS5QcVdeN85yGbLruIeOwRt4JivTdcUOvy/I5jJQE7ZXflRqQVateXRsd49nCttKkqFekhieMmqaJ4HfOfN70qRx2xITXNXYFPEls8MjUk6o3ca8h79vQmRTzhErpAhmBHs8LxVgKdC5x6TWlDcY5+6bAW44HMO25uOFoneJ4Xlg3R2YD7jDiJ47/lLilAX9sYWwLSaqiLeSeSp7BB84urQjEos4ZYKRw23ykHDu2Fxq+bMkkIK05yneDuqMkAyvEN1TfCUV6c5tTNjyInx2Eln+OrGvPMhftNVLqsWruvCIpsohbSPHl8li7Wlodq7UTWHfN8eV6O/4IvMyD6ADLVyGhsW3a+C7ggxk184NQA/CmFqid2bzfwMfQVh13a4Z21s5j7Uhdifha0x8iap/KJe6dNWFwjOqMvTK0pHgku+8sfVnncvbcO2xp6t59OVwJzswCeOmj65CXAUNU7j4cXF9c/Hl5hKMhevbHxc319/gQ/Njp7kFK+omUV8nSs2WjgNb9IJ5oWgM2IREFAB2ukEle4UOhDVFQeLjaHht0Epqmr8NNzfoPDxps9K13JqRXsGawEwHbz/88zC7uhrzv4+X38cwu7q6ub69HMPslv9l/u4vv85+XN5P9veW/n3TwX2lU8/rqu54O/39/rI3IV9Lxt/qQ9WkwXprE9qMG7c1ZDgxOKveF2/I4/DzEHzBuj9BKNekLsD/AgAA//+LnocY" } diff --git a/x-pack/metricbeat/module/oracle/performance/_meta/fields.yml b/x-pack/metricbeat/module/oracle/performance/_meta/fields.yml index a4c82db580f..def7e1148b5 100644 --- a/x-pack/metricbeat/module/oracle/performance/_meta/fields.yml +++ b/x-pack/metricbeat/module/oracle/performance/_meta/fields.yml @@ -1,7 +1,7 @@ - name: performance type: group description: Performance related metrics on a single database instance - release: beta + release: ga fields: - name: machine type: keyword diff --git a/x-pack/metricbeat/module/oracle/performance/metricset.go b/x-pack/metricbeat/module/oracle/performance/metricset.go index c408a150afc..38d1cd4a910 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset.go @@ -9,7 +9,6 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/elastic/beats/v7/metricbeat/mb" "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" ) @@ -35,8 +34,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The oracle 'performance' metricset is beta.") - config := oracle.ConnectionDetails{} if err := base.Module().UnpackConfig(&config); err != nil { return nil, errors.Wrap(err, "error parsing config file") diff --git a/x-pack/metricbeat/module/oracle/tablespace/_meta/fields.yml b/x-pack/metricbeat/module/oracle/tablespace/_meta/fields.yml index 3a653894667..1b7a4b5303d 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/_meta/fields.yml +++ b/x-pack/metricbeat/module/oracle/tablespace/_meta/fields.yml @@ -1,7 +1,7 @@ - name: tablespace type: group description: tablespace - release: beta + release: ga fields: - name: name type: keyword diff --git a/x-pack/metricbeat/module/oracle/tablespace/metricset.go b/x-pack/metricbeat/module/oracle/tablespace/metricset.go index 8fe0d504ced..1729429d79a 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/metricset.go +++ b/x-pack/metricbeat/module/oracle/tablespace/metricset.go @@ -9,7 +9,6 @@ import ( "github.com/pkg/errors" - "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/elastic/beats/v7/metricbeat/mb" "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" ) @@ -35,8 +34,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The oracle 'tablespace' metricset is beta.") - config := oracle.ConnectionDetails{} if err := base.Module().UnpackConfig(&config); err != nil { return nil, errors.Wrap(err, "error parsing config file")