Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Metricbeat] Update Couchbase module to 6.5 version #19055

Merged
merged 12 commits into from
Jun 26, 2020
+38 −33
Merged

[Metricbeat] Update Couchbase module to 6.5 version #19055

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
90fea0d
Chage required fields
sayden Jun 8, 2020
68c58d4
Add changelog entry
sayden Jun 8, 2020
aa88351
Fix make check
sayden Jun 8, 2020
0483128
Merge branch 'master' into bugfix/mb/couchbase/change-ints-to-floatin…
sayden Jun 9, 2020
df92623
Fix changelog entry
sayden Jun 9, 2020
a5c205d
Merge branch 'master' into bugfix/mb/couchbase/change-ints-to-floatin…
sayden Jun 17, 2020
fc5b797
Add changelog entry about fixing issue which was missing
sayden Jun 17, 2020
5c309ac
Modify version of couchbase testing image
sayden Jun 17, 2020
cc8d12f
Update version mentioned in docs
sayden Jun 17, 2020
4d66925
Try to fix test
sayden Jun 26, 2020
430c60e
Merge branch 'master' into bugfix/mb/couchbase/change-ints-to-floatin…
sayden Jun 26, 2020
64e3bc9
Fix indentation in python tests
jsoriano Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix getting gcp compute instance metadata with partial zone/region in config. {pull}18757[18757]
- Add missing network.sent_packets_count metric into compute metricset in googlecloud module. {pull}18802[18802]
- Fix compute and pubsub dashboard for googlecloud module. {issue}18962[18962] {pull}18980[18980]
- Update Couchbase to version 6.5 {issue}18595[18595] {pull}19055[19055]
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

*Packetbeat*

Expand Down
10 changes: 5 additions & 5 deletions metricbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6652,7 +6652,7 @@ format: bytes
Number of disk fetches.


type: long
type: double

--

Expand Down Expand Up @@ -6710,7 +6710,7 @@ format: percent
Number of operations per second.


type: long
type: double

--

Expand Down Expand Up @@ -6807,7 +6807,7 @@ type: long
Memory quota setting for the Index service (Mbyte).


type: long
type: double

--

Expand All @@ -6817,7 +6817,7 @@ type: long
Memory quota setting for the cluster (Mbyte).


type: long
type: double

--

Expand Down Expand Up @@ -6918,7 +6918,7 @@ Couchbase node metrics.
Number of get commands


type: long
type: double

--

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/couchbase/bucket/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/couchbase/bucket/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/couchbase/cluster/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/couchbase/cluster/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/couchbase/fields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion metricbeat/module/couchbase/node/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions metricbeat/module/couchbase/node/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down