From 185f69cff9a8f41bdbad1944fafdc358a9685b85 Mon Sep 17 00:00:00 2001 From: sayden Date: Thu, 5 Mar 2020 12:28:54 +0100 Subject: [PATCH 01/19] Change tags to ga --- 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/fields.yml | 2 +- x-pack/metricbeat/module/oracle/fields.go | 2 +- .../metricbeat/module/oracle/performance/_meta/fields.yml | 2 +- x-pack/metricbeat/module/oracle/performance/metricset.go | 3 --- x-pack/metricbeat/module/oracle/tablespace/_meta/fields.yml | 2 +- x-pack/metricbeat/module/oracle/tablespace/metricset.go | 3 --- 10 files changed, 7 insertions(+), 19 deletions(-) diff --git a/metricbeat/docs/modules/oracle.asciidoc b/metricbeat/docs/modules/oracle.asciidoc index 9cab2b41848a..d56abf8648ba 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 39fe10002fcc..2c57d8f6202f 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 4e498244fea7..af25323b2209 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 0da48bae0bd3..0908c674fd9a 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -193,9 +193,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/fields.yml b/x-pack/metricbeat/module/oracle/_meta/fields.yml index 7fdcea65004e..8a4f8cbd6291 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/fields.go b/x-pack/metricbeat/module/oracle/fields.go index b5908686ae96..ba6dcbed8494 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 a4c82db580f4..def7e1148b5b 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 c408a150afcc..38d1cd4a9100 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 3a653894667f..1b7a4b5303db 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 8fe0d504ced2..1729429d79a8 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") From 3bbfc1bb9aded7a5bb530946a16ae0e8f1478cfe Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 17 Mar 2020 10:37:20 +0100 Subject: [PATCH 02/19] Unskip tests --- x-pack/metricbeat/module/oracle/performance/metricset_test.go | 1 - x-pack/metricbeat/module/oracle/tablespace/metricset_test.go | 1 - 2 files changed, 2 deletions(-) diff --git a/x-pack/metricbeat/module/oracle/performance/metricset_test.go b/x-pack/metricbeat/module/oracle/performance/metricset_test.go index 097107baf3be..51d960fb7b90 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset_test.go @@ -17,7 +17,6 @@ import ( ) func TestData(t *testing.T) { - t.Skip("Skip until a proper Docker image is setup for Metricbeat") f := mbtest.NewReportingMetricSetV2WithContext(t, getConfig()) findKey := func(key string) func(common.MapStr) bool { diff --git a/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go b/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go index a7367f208066..78ac14d7610e 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go @@ -17,7 +17,6 @@ import ( ) func TestData(t *testing.T) { - t.Skip("Skip until a proper Docker image is setup for Metricbeat") r := compose.EnsureUp(t, "oracle") f := mbtest.NewReportingMetricSetV2WithContext(t, getConfig(r.Host())) From 548829c3ade06e34848fdccfdf225fa49a70f4f5 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 17 Mar 2020 11:30:31 +0100 Subject: [PATCH 03/19] Add changelog entry --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e98800ce3333..854eb4e16722 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -237,6 +237,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add Prometheus remote write endpoint {pull}16609[16609] - Release STAN module as GA. {pull}16980[16980] - Release ActiveMQ module as GA. {issue}17047[17047] {pull}17049[17049] +- Release Zookeeper/connection module as GA. {issue}14281[14281] {pull}17043[17043] *Packetbeat* From 00909ead836af8472b470ca2b5d69c7160f60407 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 17 Mar 2020 12:05:19 +0100 Subject: [PATCH 04/19] Fix changelog entry --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 854eb4e16722..ce91af7fad80 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -237,7 +237,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add Prometheus remote write endpoint {pull}16609[16609] - Release STAN module as GA. {pull}16980[16980] - Release ActiveMQ module as GA. {issue}17047[17047] {pull}17049[17049] -- Release Zookeeper/connection module as GA. {issue}14281[14281] {pull}17043[17043] +- Release Oracle module as GA. {issue}14279[14279] {pull}16833[16833] *Packetbeat* From da2b487aa310d44625e714f6e42773eaa21945a5 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 17 Mar 2020 15:26:30 +0100 Subject: [PATCH 05/19] Add docker-compose and supported-versions files --- .../module/oracle/_meta/supported-versions.yml | 2 ++ x-pack/metricbeat/module/oracle/docker-compose.yml | 12 ++++++++++++ 2 files changed, 14 insertions(+) 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/x-pack/metricbeat/module/oracle/_meta/supported-versions.yml b/x-pack/metricbeat/module/oracle/_meta/supported-versions.yml new file mode 100644 index 000000000000..2e587a42b7f6 --- /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 000000000000..d304804be630 --- /dev/null +++ b/x-pack/metricbeat/module/oracle/docker-compose.yml @@ -0,0 +1,12 @@ +version: '2.3' + +services: + oracle: + image: docker.elastic.co/integrations-ci/beats-oracle:${ORACLE_VERSION:-12.2.0.1}-1 + build: + context: ./_meta + args: + ORACLE_VERSION: ${ORACLE_VERSION:-12.2.0.1} + ports: + - 1521 + - 5500 From c098445712ca2d0984af71fb1c9af5cd322515e8 Mon Sep 17 00:00:00 2001 From: sayden Date: Wed, 18 Mar 2020 12:30:48 +0100 Subject: [PATCH 06/19] Add oracle tag --- x-pack/metricbeat/module/oracle/performance/metricset_test.go | 1 + x-pack/metricbeat/module/oracle/tablespace/metricset_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/x-pack/metricbeat/module/oracle/performance/metricset_test.go b/x-pack/metricbeat/module/oracle/performance/metricset_test.go index 51d960fb7b90..849b806abbb8 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset_test.go @@ -3,6 +3,7 @@ // you may not use this file except in compliance with the Elastic License. // +build integration +// +build oracle package performance diff --git a/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go b/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go index 78ac14d7610e..f960e2918a3d 100644 --- a/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/tablespace/metricset_test.go @@ -3,6 +3,7 @@ // you may not use this file except in compliance with the Elastic License. // +build integration +// +build oracle package tablespace From 24434bc0b6e0f5da86f4db718ad05eda927a15fd Mon Sep 17 00:00:00 2001 From: sayden Date: Wed, 18 Mar 2020 12:32:24 +0100 Subject: [PATCH 07/19] Change image to the cached one --- x-pack/metricbeat/module/oracle/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/metricbeat/module/oracle/_meta/Dockerfile b/x-pack/metricbeat/module/oracle/_meta/Dockerfile index 4beaff0b8532..0ed97080a7f8 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 From a38ea7d5e703563a62df0ecaf60a7a6882e13a03 Mon Sep 17 00:00:00 2001 From: sayden Date: Wed, 18 Mar 2020 13:05:51 +0100 Subject: [PATCH 08/19] Add ensureup to performance metricset test --- x-pack/metricbeat/module/oracle/performance/metricset_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x-pack/metricbeat/module/oracle/performance/metricset_test.go b/x-pack/metricbeat/module/oracle/performance/metricset_test.go index 849b806abbb8..77e50302f6c1 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset_test.go @@ -18,6 +18,8 @@ import ( ) func TestData(t *testing.T) { + r := compose.EnsureUp(t, "oracle") + f := mbtest.NewReportingMetricSetV2WithContext(t, getConfig()) findKey := func(key string) func(common.MapStr) bool { From a6360b8b8f2bdb6ce73dcf7c6cbd872534b01edf Mon Sep 17 00:00:00 2001 From: sayden Date: Wed, 18 Mar 2020 13:19:02 +0100 Subject: [PATCH 09/19] add docker-compose.yml to oracle --- x-pack/metricbeat/module/oracle/docker-compose.yml | 2 +- x-pack/metricbeat/module/oracle/performance/metricset_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/metricbeat/module/oracle/docker-compose.yml b/x-pack/metricbeat/module/oracle/docker-compose.yml index d304804be630..1b6845a9da59 100644 --- a/x-pack/metricbeat/module/oracle/docker-compose.yml +++ b/x-pack/metricbeat/module/oracle/docker-compose.yml @@ -2,7 +2,7 @@ version: '2.3' services: oracle: - image: docker.elastic.co/integrations-ci/beats-oracle:${ORACLE_VERSION:-12.2.0.1}-1 + image: docker.elastic.co/observability-ci/database-enterprise:${ORACLE_VERSION:-12.2.0.1}-1 build: context: ./_meta args: diff --git a/x-pack/metricbeat/module/oracle/performance/metricset_test.go b/x-pack/metricbeat/module/oracle/performance/metricset_test.go index 77e50302f6c1..293ff1665e00 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset_test.go @@ -13,6 +13,7 @@ import ( _ "github.com/godror/godror" "github.com/elastic/beats/v7/libbeat/common" + "github.com/elastic/beats/v7/libbeat/tests/compose" mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" "github.com/elastic/beats/v7/x-pack/metricbeat/module/oracle" ) @@ -20,7 +21,7 @@ import ( func TestData(t *testing.T) { r := compose.EnsureUp(t, "oracle") - f := mbtest.NewReportingMetricSetV2WithContext(t, getConfig()) + f := mbtest.NewReportingMetricSetV2WithContext(t, getConfig(r.Host())) findKey := func(key string) func(common.MapStr) bool { return func(in common.MapStr) bool { From 97d319a74ca77b4a39f8efaf5f0fb8ecdb926821 Mon Sep 17 00:00:00 2001 From: sayden Date: Wed, 18 Mar 2020 14:46:03 +0100 Subject: [PATCH 10/19] Move changelog entry to bottom --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index d3e850fcba91..9232a81af483 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -254,10 +254,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Release STAN module as GA. {pull}16980[16980] - Add query metricset for prometheus module. {pull}17104[17104] - Release ActiveMQ module as GA. {issue}17047[17047] {pull}17049[17049] -- Release Oracle module as GA. {issue}14279[14279] {pull}16833[16833] - Release Zookeeper/connection module as GA. {issue}14281[14281] {pull}17043[17043] - Add support for CouchDB v2 {issue}16352[16352] {pull}16455[16455] - Replace vpc metricset into vpn, transitgateway and natgateway metricsets. {pull}16892[16892] +- Release Oracle module as GA. {issue}14279[14279] {pull}16833[16833] *Packetbeat* From ff9a813f4cd7331b3b150aebcd1f8057856d052d Mon Sep 17 00:00:00 2001 From: sayden Date: Thu, 19 Mar 2020 17:44:07 +0100 Subject: [PATCH 11/19] Add tag to Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2a4cc2740d5f..2d2f32f81ba1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -574,6 +574,7 @@ def withBeatsEnv(Closure body){ "TEST_COVERAGE=true", "RACE_DETECTOR=true", "PYTHON_ENV=${WORKSPACE}/python-env", + "TEST_TAGS=oracle", ]){ deleteDir() unstash 'source' From d22a8af91f29b1b6d2ccee38a7ca2ab1948b3757 Mon Sep 17 00:00:00 2001 From: sayden Date: Fri, 20 Mar 2020 10:31:29 +0100 Subject: [PATCH 12/19] Add python tests (intented to fail right now) --- .../metricbeat/module/oracle/test_oracle.py | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 x-pack/metricbeat/module/oracle/test_oracle.py diff --git a/x-pack/metricbeat/module/oracle/test_oracle.py b/x-pack/metricbeat/module/oracle/test_oracle.py new file mode 100644 index 000000000000..c9670aeed7c6 --- /dev/null +++ b/x-pack/metricbeat/module/oracle/test_oracle.py @@ -0,0 +1,55 @@ +import os +import sys +import unittest + +sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) +from xpack_metricbeat import XPackTest, metricbeat + + +class Test(XPackTest): + + COMPOSE_SERVICES = ['oracle'] + + @unittest.skipUnless(metricbeat.INTEGRATION_TESTS, "integration test") + def test_performance(self): + """ + oracle performance test + """ + self.render_config_template(modules=[{ + "name": "oracle", + "metricsets": ["performance"], + "hosts": self.get_hosts(), + "period": "5s", + }]) + proc = self.start_beat(home=self.beat_path) + self.wait_until(lambda: self.output_lines() > 0) + proc.check_kill_and_wait() + self.assert_no_logged_warnings() + + output = self.read_output_json() + self.assertGreater(len(output), 0) + + for evt in output: + self.assert_fields_are_documented(evt) + + @unittest.skipUnless(metricbeat.INTEGRATION_TESTS, "integration test") + def test_tablespace(self): + """ + oracle tablespace test + """ + self.render_config_template(modules=[{ + "name": "oracle", + "metricsets": ["tablespace"], + "hosts": self.get_hosts(), + "period": "5s", + }]) + proc = self.start_beat(home=self.beat_path) + self.wait_until(lambda: self.output_lines() > 0) + proc.check_kill_and_wait() + self.assert_no_logged_warnings() + + output = self.read_output_json() + self.assertGreater(len(output), 0) + + for evt in output: + self.assert_fields_are_documented(evt) From ab69fe7ad8d2b93e9aa6038c1dcac728bd7e3fcf Mon Sep 17 00:00:00 2001 From: sayden Date: Fri, 20 Mar 2020 14:06:29 +0100 Subject: [PATCH 13/19] Fix the test now and try. It "should" pass --- .../metricbeat/module/oracle/performance/metricset_test.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/x-pack/metricbeat/module/oracle/performance/metricset_test.go b/x-pack/metricbeat/module/oracle/performance/metricset_test.go index 293ff1665e00..216814a8dc36 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset_test.go @@ -2,9 +2,6 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. -// +build integration -// +build oracle - package performance import ( @@ -57,11 +54,11 @@ func TestData(t *testing.T) { } } -func getConfig() map[string]interface{} { +func getConfig(host string) map[string]interface{} { return map[string]interface{}{ "module": "oracle", "metricsets": []string{"performance"}, - "hosts": []string{oracle.GetOracleConnectionDetails("localhost")}, + "hosts": []string{oracle.GetOracleConnectionDetails(host)}, "username": "sys", "password": "Oradoc_db1", } From dc7b5d5db985da1277171c39fa425dc7094e6208 Mon Sep 17 00:00:00 2001 From: sayden Date: Fri, 20 Mar 2020 14:41:03 +0100 Subject: [PATCH 14/19] Add DOCKER_PULL=0 to Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2d2f32f81ba1..1087f551050b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -575,6 +575,7 @@ def withBeatsEnv(Closure body){ "RACE_DETECTOR=true", "PYTHON_ENV=${WORKSPACE}/python-env", "TEST_TAGS=oracle", + "DOCKER_PULL=0", ]){ deleteDir() unstash 'source' From 77beba272f2044e58db892054c02aa25a2f69651 Mon Sep 17 00:00:00 2001 From: sayden Date: Mon, 23 Mar 2020 13:00:27 +0100 Subject: [PATCH 15/19] Update image to point to the specific path of sqlplus binary --- x-pack/metricbeat/module/oracle/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/metricbeat/module/oracle/_meta/Dockerfile b/x-pack/metricbeat/module/oracle/_meta/Dockerfile index 0ed97080a7f8..7bea9aaf3a03 100644 --- a/x-pack/metricbeat/module/oracle/_meta/Dockerfile +++ b/x-pack/metricbeat/module/oracle/_meta/Dockerfile @@ -1,3 +1,3 @@ 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 From 7830f82ee58f3420cbea58028f7da09668983477 Mon Sep 17 00:00:00 2001 From: sayden Date: Mon, 23 Mar 2020 23:06:56 +0100 Subject: [PATCH 16/19] Add build tags to performance tests --- x-pack/metricbeat/module/oracle/performance/metricset_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x-pack/metricbeat/module/oracle/performance/metricset_test.go b/x-pack/metricbeat/module/oracle/performance/metricset_test.go index 216814a8dc36..359bdd12c97d 100644 --- a/x-pack/metricbeat/module/oracle/performance/metricset_test.go +++ b/x-pack/metricbeat/module/oracle/performance/metricset_test.go @@ -1,6 +1,8 @@ // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. +// +build integration +// +build oracle package performance From 3f336fedb27a4ed22a14e23a31bcf2b65a98b29d Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 24 Mar 2020 09:55:42 +0100 Subject: [PATCH 17/19] Oracle python test --- x-pack/metricbeat/module/oracle/test_oracle.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/x-pack/metricbeat/module/oracle/test_oracle.py b/x-pack/metricbeat/module/oracle/test_oracle.py index c9670aeed7c6..3692b2c8fe51 100644 --- a/x-pack/metricbeat/module/oracle/test_oracle.py +++ b/x-pack/metricbeat/module/oracle/test_oracle.py @@ -10,6 +10,10 @@ class Test(XPackTest): COMPOSE_SERVICES = ['oracle'] + def get_hosts(self): + return [self.compose_host(port='1521/tcp')+'/ORCLPDB1.localdomain'] + + @metricbeat.tag('oracle') @unittest.skipUnless(metricbeat.INTEGRATION_TESTS, "integration test") def test_performance(self): """ @@ -20,6 +24,8 @@ def test_performance(self): "metricsets": ["performance"], "hosts": self.get_hosts(), "period": "5s", + "username":"sys" + "password":"Oradoc_db1" }]) proc = self.start_beat(home=self.beat_path) self.wait_until(lambda: self.output_lines() > 0) @@ -32,6 +38,7 @@ def test_performance(self): for evt in output: self.assert_fields_are_documented(evt) + @metricbeat.tag('oracle') @unittest.skipUnless(metricbeat.INTEGRATION_TESTS, "integration test") def test_tablespace(self): """ @@ -42,6 +49,8 @@ def test_tablespace(self): "metricsets": ["tablespace"], "hosts": self.get_hosts(), "period": "5s", + "username":"sys" + "password":"Oradoc_db1" }]) proc = self.start_beat(home=self.beat_path) self.wait_until(lambda: self.output_lines() > 0) From 95e8490c9daff0b64cde3084ef1cf697521b9245 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 24 Mar 2020 10:26:18 +0100 Subject: [PATCH 18/19] Fix typo --- x-pack/metricbeat/module/oracle/test_oracle.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/metricbeat/module/oracle/test_oracle.py b/x-pack/metricbeat/module/oracle/test_oracle.py index 3692b2c8fe51..cc511182378b 100644 --- a/x-pack/metricbeat/module/oracle/test_oracle.py +++ b/x-pack/metricbeat/module/oracle/test_oracle.py @@ -24,7 +24,7 @@ def test_performance(self): "metricsets": ["performance"], "hosts": self.get_hosts(), "period": "5s", - "username":"sys" + "username":"sys", "password":"Oradoc_db1" }]) proc = self.start_beat(home=self.beat_path) @@ -49,7 +49,7 @@ def test_tablespace(self): "metricsets": ["tablespace"], "hosts": self.get_hosts(), "period": "5s", - "username":"sys" + "username":"sys", "password":"Oradoc_db1" }]) proc = self.start_beat(home=self.beat_path) From 6ef2ebb47598906991bd7600926c7c27c038c506 Mon Sep 17 00:00:00 2001 From: sayden Date: Tue, 24 Mar 2020 11:47:58 +0100 Subject: [PATCH 19/19] Remove python test --- .../metricbeat/module/oracle/test_oracle.py | 64 ------------------- 1 file changed, 64 deletions(-) delete mode 100644 x-pack/metricbeat/module/oracle/test_oracle.py diff --git a/x-pack/metricbeat/module/oracle/test_oracle.py b/x-pack/metricbeat/module/oracle/test_oracle.py deleted file mode 100644 index cc511182378b..000000000000 --- a/x-pack/metricbeat/module/oracle/test_oracle.py +++ /dev/null @@ -1,64 +0,0 @@ -import os -import sys -import unittest - -sys.path.append(os.path.join(os.path.dirname(__file__), '../../tests/system')) -from xpack_metricbeat import XPackTest, metricbeat - - -class Test(XPackTest): - - COMPOSE_SERVICES = ['oracle'] - - def get_hosts(self): - return [self.compose_host(port='1521/tcp')+'/ORCLPDB1.localdomain'] - - @metricbeat.tag('oracle') - @unittest.skipUnless(metricbeat.INTEGRATION_TESTS, "integration test") - def test_performance(self): - """ - oracle performance test - """ - self.render_config_template(modules=[{ - "name": "oracle", - "metricsets": ["performance"], - "hosts": self.get_hosts(), - "period": "5s", - "username":"sys", - "password":"Oradoc_db1" - }]) - proc = self.start_beat(home=self.beat_path) - self.wait_until(lambda: self.output_lines() > 0) - proc.check_kill_and_wait() - self.assert_no_logged_warnings() - - output = self.read_output_json() - self.assertGreater(len(output), 0) - - for evt in output: - self.assert_fields_are_documented(evt) - - @metricbeat.tag('oracle') - @unittest.skipUnless(metricbeat.INTEGRATION_TESTS, "integration test") - def test_tablespace(self): - """ - oracle tablespace test - """ - self.render_config_template(modules=[{ - "name": "oracle", - "metricsets": ["tablespace"], - "hosts": self.get_hosts(), - "period": "5s", - "username":"sys", - "password":"Oradoc_db1" - }]) - proc = self.start_beat(home=self.beat_path) - self.wait_until(lambda: self.output_lines() > 0) - proc.check_kill_and_wait() - self.assert_no_logged_warnings() - - output = self.read_output_json() - self.assertGreater(len(output), 0) - - for evt in output: - self.assert_fields_are_documented(evt)