Add host inventory metrics to googlecloud compute metricset (#20391) (#…

…20724) * Add host inventory metrics to googlecloud compute metricset (cherry picked from commit cbb2f37)
elastic · Aug 24, 2020 · 2ce5481 · 2ce5481
1 parent c44fe6d
commit 2ce5481
Show file tree

Hide file tree

Showing 10 changed files with 168 additions and 192 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -726,6 +726,7 @@ field. You can revert this change by configuring tags for the module and omittin
 - Add cloud.instance.name into aws ec2 metricset. {pull}20077[20077]
 - Add host inventory metrics into aws ec2 metricset. {pull}20171[20171]
 - Add `scope` setting for elasticsearch module, allowing it to monitor an Elasticsearch cluster behind a load-balancing proxy. {issue}18539[18539] {pull}18547[18547]
+- Add host inventory metrics to googlecloud compute metricset. {pull}20391[20391]
 - Add host inventory metrics to azure compute_vm metricset. {pull}20641[20641]
 
 *Packetbeat*

diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data.json b/x-pack/metricbeat/module/googlecloud/compute/_meta/data.json
@@ -5,15 +5,16 @@
  "id": "elastic-observability"
  },
  "instance": {
- "id": "7692260917184259934",
- "name": "instance-test-ks"
+ "id": "2438671519308240892",
+ "name": "heartbeat-mumbai"
  },
  "machine": {
- "type": "e2-standard-2"
+ "type": "f1-micro"
  },
  "provider": "googlecloud"
  },
- "cloud.availability_zone": "us-central1-a",
+ "cloud.availability_zone": "asia-south1-c",
+ "cloud.region": "asia-south1",
  "event": {
  "dataset": "googlecloud.compute",
  "duration": 115000,
@@ -23,50 +24,37 @@
  "compute": {
  "firewall": {
  "dropped_bytes_count": {
- "value": 171
+ "value": 435
  },
  "dropped_packets_count": {
- "value": 4
+ "value": 7
  }
  },
  "instance": {
  "cpu": {
  "reserved_cores": {
- "value": 2
+ "value": 0.2
  },
  "usage_time": {
- "value": 0.1803964574089818
+ "value": 0.8653667340986431
  },
  "utilization": {
- "value": 0.001503303811741515
- }
- },
- "memory": {
- "balloon": {
- "ram_size": {
- "value": 7896264704
- },
- "ram_used": {
- "value": 416518144
- },
- "swap_in_bytes_count": {
- "value": 0
- },
- "swap_out_bytes_count": {
- "value": 0
- }
+ "value": 0.07211389450822024
  }
  },
  "uptime": {
- "value": 60.000000000000455
+ "value": 60
  }
  }
  },
- "labels": {
- "user": {
- "created-by": "ks"
- }
- }
+ "labels": {}
+ },
+ "host": {
+ "cpu": {
+ "pct": 0.07211389450822024
+ },
+ "id": "2438671519308240892",
+ "name": "heartbeat-mumbai"
  },
  "metricset": {
  "name": "compute",

diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_cpu.json b/x-pack/metricbeat/module/googlecloud/compute/_meta/data_cpu.json
@@ -5,15 +5,16 @@
  "id": "elastic-observability"
  },
  "instance": {
- "id": "7692260917184259934",
- "name": "instance-test-ks"
+ "id": "7925831082803123728",
+ "name": "heartbeat-tokyo"
  },
  "machine": {
- "type": "e2-standard-2"
+ "type": "f1-micro"
  },
  "provider": "googlecloud"
  },
- "cloud.availability_zone": "us-central1-a",
+ "cloud.availability_zone": "asia-northeast1-b",
+ "cloud.region": "asia-northeast1",
  "event": {
  "dataset": "googlecloud.compute",
  "duration": 115000,
@@ -23,50 +24,37 @@
  "compute": {
  "firewall": {
  "dropped_bytes_count": {
- "value": 171
+ "value": 422
  },
  "dropped_packets_count": {
- "value": 4
+ "value": 7
  }
  },
  "instance": {
  "cpu": {
  "reserved_cores": {
- "value": 2
+ "value": 0.2
  },
  "usage_time": {
- "value": 0.1803964574089818
+ "value": 0.8921228461549617
  },
  "utilization": {
- "value": 0.001503303811741515
- }
- },
- "memory": {
- "balloon": {
- "ram_size": {
- "value": 7896264704
- },
- "ram_used": {
- "value": 416518144
- },
- "swap_in_bytes_count": {
- "value": 0
- },
- "swap_out_bytes_count": {
- "value": 0
- }
+ "value": 0.07434357051291347
  }
  },
  "uptime": {
- "value": 60.000000000000455
+ "value": 60
  }
  }
  },
- "labels": {
- "user": {
- "created-by": "ks"
- }
- }
+ "labels": {}
+ },
+ "host": {
+ "cpu": {
+ "pct": 0.07434357051291347
+ },
+ "id": "7925831082803123728",
+ "name": "heartbeat-tokyo"
  },
  "metricset": {
  "name": "compute",

diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_disk.json b/x-pack/metricbeat/module/googlecloud/compute/_meta/data_disk.json
@@ -5,15 +5,16 @@
  "id": "elastic-observability"
  },
  "instance": {
- "id": "7692260917184259934",
- "name": "instance-test-ks"
+ "id": "7925831082803123728",
+ "name": "heartbeat-tokyo"
  },
  "machine": {
- "type": "e2-standard-2"
+ "type": "f1-micro"
  },
  "provider": "googlecloud"
  },
- "cloud.availability_zone": "us-central1-a",
+ "cloud.availability_zone": "asia-northeast1-b",
+ "cloud.region": "asia-northeast1",
  "event": {
  "dataset": "googlecloud.compute",
  "duration": 115000,
@@ -30,25 +31,34 @@
  "value": 0
  },
  "write_bytes_count": {
- "value": 158506
+ "value": 0
  },
  "write_ops_count": {
- "value": 25
+ "value": 0
  }
  }
  }
  },
  "labels": {
  "metrics": {
- "device_name": "instance-test-ks",
+ "device_name": "disk-1",
  "device_type": "permanent",
  "storage_type": "pd-standard"
- },
- "user": {
- "created-by": "ks"
  }
  }
  },
+ "host": {
+ "disk": {
+ "read": {
+ "bytes": 0
+ },
+ "write": {
+ "bytes": 0
+ }
+ },
+ "id": "7925831082803123728",
+ "name": "heartbeat-tokyo"
+ },
  "metricset": {
  "name": "compute",
  "period": 10000

diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_firewall.json b/x-pack/metricbeat/module/googlecloud/compute/_meta/data_firewall.json
@@ -5,15 +5,16 @@
  "id": "elastic-observability"
  },
  "instance": {
- "id": "7692260917184259934",
- "name": "instance-test-ks"
+ "id": "7925831082803123728",
+ "name": "heartbeat-tokyo"
  },
  "machine": {
- "type": "e2-standard-2"
+ "type": "f1-micro"
  },
  "provider": "googlecloud"
  },
- "cloud.availability_zone": "us-central1-a",
+ "cloud.availability_zone": "asia-northeast1-b",
+ "cloud.region": "asia-northeast1",
  "event": {
  "dataset": "googlecloud.compute",
  "duration": 115000,
@@ -23,50 +24,37 @@
  "compute": {
  "firewall": {
  "dropped_bytes_count": {
- "value": 277
+ "value": 422
  },
  "dropped_packets_count": {
- "value": 5
+ "value": 7
  }
  },
  "instance": {
  "cpu": {
  "reserved_cores": {
- "value": 2
+ "value": 0.2
  },
  "usage_time": {
- "value": 0.18404532833979204
+ "value": 0.8921228461549617
  },
  "utilization": {
- "value": 0.001533711069498267
- }
- },
- "memory": {
- "balloon": {
- "ram_size": {
- "value": 7896264704
- },
- "ram_used": {
- "value": 416260096
- },
- "swap_in_bytes_count": {
- "value": 0
- },
- "swap_out_bytes_count": {
- "value": 0
- }
+ "value": 0.07434357051291347
  }
  },
  "uptime": {
  "value": 60
  }
  }
  },
- "labels": {
- "user": {
- "created-by": "ks"
- }
- }
+ "labels": {}
+ },
+ "host": {
+ "cpu": {
+ "pct": 0.07434357051291347
+ },
+ "id": "7925831082803123728",
+ "name": "heartbeat-tokyo"
  },
  "metricset": {
  "name": "compute",