[Metricbeat] Update Couchbase module to 6.5 version (elastic#19055)

melchiormoulin · Oct 14, 2020 · 9dd0008 · 9dd0008
1 parent c24d64b
commit 9dd0008
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 33 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -256,6 +256,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix incorrect usage of hints builder when exposed port is a substring of the hint {pull}19052[19052]
 - Remove dedot for tag values in aws module. {issue}19112[19112] {pull}19221[19221]
 - Stop counterCache only when already started {pull}19103[19103]
+- Fix bug incorrect parsing of float numbers as integers in Couchbase module {issue}18949[18949] {pull}19055[19055]
 
 *Packetbeat*
 
@@ -508,6 +509,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add memory metrics into compute googlecloud. {pull}18802[18802]
 - Add new fields to HAProxy module. {issue}18523[18523]
 - Add Tomcat overview dashboard {pull}14026[14026]
+- Update Couchbase to version 6.5 {issue}18595[18595] {pull}19055[19055]
 - Add dashboards for googlecloud load balancing metricset. {pull}18369[18369]
 - Add support for v1 consumer API in Cloud Foundry module, use it by default. {pull}19268[19268]
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -6652,7 +6652,7 @@ format: bytes
 Number of disk fetches.
 
 
-type: long
+type: double
 
 --
 
@@ -6710,7 +6710,7 @@ format: percent
 Number of operations per second.
 
 
-type: long
+type: double
 
 --
 
@@ -6807,7 +6807,7 @@ type: long
 Memory quota setting for the Index service (Mbyte).
 
 
-type: long
+type: double
 
 --
 
@@ -6817,7 +6817,7 @@ type: long
 Memory quota setting for the cluster (Mbyte).
 
 
-type: long
+type: double
 
 --
 
@@ -6918,7 +6918,7 @@ Couchbase node metrics.
 Number of get commands
 
 
-type: long
+type: double
 
 --
 

diff --git a/metricbeat/docs/modules/couchbase.asciidoc b/metricbeat/docs/modules/couchbase.asciidoc
@@ -11,7 +11,7 @@ servers. The default metricsets are `bucket`, `cluster`, `node`.
 [float]
 === Compatibility
 
-The Couchbase module is tested with Couchbase 4.5.1.
+The Couchbase module is tested with Couchbase 6.5.1.
 
 
 [float]

diff --git a/metricbeat/module/couchbase/_meta/Dockerfile b/metricbeat/module/couchbase/_meta/Dockerfile
@@ -1,6 +1,6 @@
 ARG COUCHBASE_VERSION
 FROM couchbase:${COUCHBASE_VERSION}
-HEALTHCHECK --interval=1s --retries=90 CMD [ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8091/pools/default/buckets/beer-sample)" -eq "200" ]
+HEALTHCHECK --interval=1s --retries=90 CMD [ "$(curl -s -o /dev/null -w ''%{http_code}'' -u Administrator:password http://localhost:8091/pools/default/buckets/beer-sample)" -eq "200" ]
 COPY configure-node.sh /opt/couchbase
 
 CMD ["/opt/couchbase/configure-node.sh"]
diff --git a/metricbeat/module/couchbase/_meta/docs.asciidoc b/metricbeat/module/couchbase/_meta/docs.asciidoc
@@ -4,7 +4,7 @@ servers. The default metricsets are `bucket`, `cluster`, `node`.
 [float]
 === Compatibility
 
-The Couchbase module is tested with Couchbase 4.5.1.
+The Couchbase module is tested with Couchbase 6.5.1.
 
 
 [float]

diff --git a/metricbeat/module/couchbase/bucket/_meta/fields.yml b/metricbeat/module/couchbase/bucket/_meta/fields.yml
@@ -18,7 +18,7 @@
       description: >
         Size of user data within buckets of the specified state that are resident in RAM.
     - name: disk.fetches
-      type: long
+      type: double
       description: >
         Number of disk fetches.
     - name: disk.used.bytes
@@ -42,7 +42,7 @@
       description: >
         Percentage of RAM used (for active objects) against the configured bucket size (%).
     - name: ops_per_sec
-      type: long
+      type: double
       description: >
         Number of operations per second.
     - name: item_count

diff --git a/metricbeat/module/couchbase/bucket/data.go b/metricbeat/module/couchbase/bucket/data.go
@@ -31,7 +31,7 @@ type BucketQuota struct {
 
 type BucketBasicStats struct {
 	QuotaPercentUsed float64 `json:"quotaPercentUsed"`
-	OpsPerSec        int64   `json:"opsPerSec"`
+	OpsPerSec        float64 `json:"opsPerSec"`
 	DiskFetches      int64   `json:"diskFetches"`
 	ItemCount        int64   `json:"itemCount"`
 	DiskUsed         int64   `json:"diskUsed"`

diff --git a/metricbeat/module/couchbase/cluster/_meta/fields.yml b/metricbeat/module/couchbase/cluster/_meta/fields.yml
@@ -34,11 +34,11 @@
       description: >
         Max bucket count setting.
     - name: quota.index_memory.mb
-      type: long
+      type: double
       description: >
         Memory quota setting for the Index service (Mbyte).
     - name: quota.memory.mb
-      type: long
+      type: double
       description: >
         Memory quota setting for the cluster (Mbyte).
     - name: ram.quota.total.value.bytes

diff --git a/metricbeat/module/couchbase/cluster/data.go b/metricbeat/module/couchbase/cluster/data.go
@@ -48,8 +48,8 @@ type StorageTotals struct {
 
 type Data struct {
 	StorageTotals        StorageTotals `json:"storageTotals"`
-	IndexMemoryQuota     int64         `json:"indexMemoryQuota"`
-	MemoryQuota          int64         `json:"memoryQuota"`
+	IndexMemoryQuota     float64       `json:"indexMemoryQuota"`
+	MemoryQuota          float64       `json:"memoryQuota"`
 	RebalanceStatus      string        `json:"rebalanceStatus"`
 	RebalanceProgressURI string        `json:"rebalanceProgressUri"`
 	StopRebalanceURI     string        `json:"stopRebalanceUri"`

diff --git a/metricbeat/module/couchbase/docker-compose.yml b/metricbeat/module/couchbase/docker-compose.yml
@@ -2,10 +2,10 @@ version: '2.3'
 
 services:
   couchbase:
-    image: docker.elastic.co/integrations-ci/beats-couchbase:${COUCHBASE_VERSION:-4.5.1}-1
+    image: docker.elastic.co/integrations-ci/beats-couchbase:${COUCHBASE_VERSION:-6.5.1}-1
     build:
       context: ./_meta
       args:
-        COUCHBASE_VERSION: ${COUCHBASE_VERSION:-4.5.1}
+        COUCHBASE_VERSION: ${COUCHBASE_VERSION:-6.5.1}
     ports:
       - 8091
diff --git a/metricbeat/module/couchbase/fields.go b/metricbeat/module/couchbase/fields.go
diff --git a/metricbeat/module/couchbase/node/_meta/fields.yml b/metricbeat/module/couchbase/node/_meta/fields.yml
@@ -5,7 +5,7 @@
   release: ga
   fields:
     - name: cmd_get
-      type: long
+      type: double
       description: >
         Number of get commands
     - name: couch.docs.disk_size.bytes

diff --git a/metricbeat/module/couchbase/node/data.go b/metricbeat/module/couchbase/node/data.go
@@ -35,20 +35,20 @@ type NodeSystemStats struct {
 }
 
 type NodeInterestingStats struct {
-	CmdGet                   int64 `json:"cmd_get"`
-	CouchDocsActualDiskSize  int64 `json:"couch_docs_actual_disk_size"`
-	CouchDocsDataSize        int64 `json:"couch_docs_data_size"`
-	CouchSpatialDataSize     int64 `json:"couch_spatial_data_size"`
-	CouchSpatialDiskSize     int64 `json:"couch_spatial_disk_size"`
-	CouchViewsActualDiskSize int64 `json:"couch_views_actual_disk_size"`
-	CouchViewsDataSize       int64 `json:"couch_views_data_size"`
-	CurrItems                int64 `json:"curr_items"`
-	CurrItemsTot             int64 `json:"curr_items_tot"`
-	EpBgFetched              int64 `json:"ep_bg_fetched"`
-	GetHits                  int64 `json:"get_hits"`
-	MemUsed                  int64 `json:"mem_used"`
-	Ops                      int64 `json:"ops"`
-	VbReplicaCurrItems       int64 `json:"vb_replica_curr_items"`
+	CmdGet                   float64 `json:"cmd_get"`
+	CouchDocsActualDiskSize  int64   `json:"couch_docs_actual_disk_size"`
+	CouchDocsDataSize        int64   `json:"couch_docs_data_size"`
+	CouchSpatialDataSize     int64   `json:"couch_spatial_data_size"`
+	CouchSpatialDiskSize     int64   `json:"couch_spatial_disk_size"`
+	CouchViewsActualDiskSize int64   `json:"couch_views_actual_disk_size"`
+	CouchViewsDataSize       int64   `json:"couch_views_data_size"`
+	CurrItems                int64   `json:"curr_items"`
+	CurrItemsTot             int64   `json:"curr_items_tot"`
+	EpBgFetched              int64   `json:"ep_bg_fetched"`
+	GetHits                  int64   `json:"get_hits"`
+	MemUsed                  int64   `json:"mem_used"`
+	Ops                      int64   `json:"ops"`
+	VbReplicaCurrItems       int64   `json:"vb_replica_curr_items"`
 }
 
 type Node struct {

diff --git a/metricbeat/module/couchbase/test_couchbase.py b/metricbeat/module/couchbase/test_couchbase.py
@@ -23,3 +23,6 @@ def test_couchbase(self, metricset):
         couchbase metricsets tests
         """
         self.check_metricset("couchbase", metricset, self.get_hosts(), self.FIELDS)
+
+    def get_hosts(self):
+        return ["http://Administrator:password@" + self.compose_host()]