diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 63e8d97ee74..1df61490317 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -100,6 +100,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Remove "invalid zero" metrics on Windows and Darwin, don't report linux-only memory and diskio metrics when running under agent. {pull}21457[21457] - Change cloud.provider from googlecloud to gcp. {pull}21775[21775] - API address and shard ID are required settings in the Cloud Foundry module. {pull}21759[21759] +- Rename googlecloud module to gcp module. {pull}22246[22246] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index a193d630564..8e3ecf76379 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -36,8 +36,8 @@ grouped in the following categories: * <> * <> * <> +* <> * <> -* <> * <> * <> * <> @@ -19845,1256 +19845,1256 @@ type: integer -- -[[exported-fields-golang]] -== Golang fields - -Golang module - - +[[exported-fields-gcp]] +== Google Cloud Platform fields -[float] -=== golang +GCP module -[float] -=== expvar +*`gcp.labels`*:: ++ +-- +GCP monitoring metrics labels -expvar +type: object +-- -*`golang.expvar.cmdline`*:: +*`gcp.metrics.*.*.*.*`*:: + -- -The cmdline of this Go program start with. +Metrics that returned from Google Cloud API query. -type: keyword +type: object -- [float] -=== heap - -The Go program heap information exposed by expvar. +=== billing +Google Cloud Billing metrics -*`golang.heap.cmdline`*:: +*`gcp.billing.cost_type`*:: + -- -The cmdline of this Go program start with. +Cost types include regular, tax, adjustment, and rounding_error. +type: keyword + +-- + +*`gcp.billing.invoice_month`*:: ++ +-- +Billing report month. type: keyword -- -[float] -=== gc +*`gcp.billing.project_id`*:: ++ +-- +Project ID of the billing report belongs to. -Garbage collector summary. +type: keyword + +-- +*`gcp.billing.total`*:: ++ +-- +Total billing amount. +type: float + +-- [float] -=== total_pause +=== compute -Total GC pause duration over lifetime of process. +Google Cloud Compute metrics -*`golang.heap.gc.total_pause.ns`*:: + +*`gcp.compute.instance.firewall.dropped_bytes_count.value`*:: + -- -Duration in Ns. - +Incoming bytes dropped by the firewall type: long -- -*`golang.heap.gc.total_count`*:: +*`gcp.compute.instance.firewall.dropped_packets_count.value`*:: + -- -Total number of GC was happened. - +Incoming packets dropped by the firewall type: long -- -*`golang.heap.gc.next_gc_limit`*:: + +*`gcp.compute.instance.cpu.reserved_cores.value`*:: + -- -Next collection will happen when HeapAlloc > this amount. - - -type: long +Number of cores reserved on the host of the instance -format: bytes +type: double -- -*`golang.heap.gc.cpu_fraction`*:: +*`gcp.compute.instance.cpu.utilization.value`*:: + -- -Fraction of CPU time used by GC. - +The fraction of the allocated CPU that is currently in use on the instance -type: float +type: double -- -[float] -=== pause +*`gcp.compute.instance.cpu.usage_time.value`*:: ++ +-- +Usage for all cores in seconds -Last GC pause durations during the monitoring period. +type: double +-- -*`golang.heap.gc.pause.count`*:: +*`gcp.compute.instance.disk.read_bytes_count.value`*:: + -- -Count of GC pause duration during this collect period. - +Count of bytes read from disk type: long -- -[float] -=== sum - -Total GC pause duration during this collect period. - - - -*`golang.heap.gc.pause.sum.ns`*:: +*`gcp.compute.instance.disk.read_ops_count.value`*:: + -- -Duration in Ns. - +Count of disk read IO operations type: long -- -[float] -=== max - -Max GC pause duration during this collect period. - - - -*`golang.heap.gc.pause.max.ns`*:: +*`gcp.compute.instance.disk.write_bytes_count.value`*:: + -- -Duration in Ns. - +Count of bytes written to disk type: long -- -[float] -=== avg - -Average GC pause duration during this collect period. - - - -*`golang.heap.gc.pause.avg.ns`*:: +*`gcp.compute.instance.disk.write_ops_count.value`*:: + -- -Duration in Ns. - +Count of disk write IO operations type: long -- -[float] -=== system +*`gcp.compute.instance.uptime.value`*:: ++ +-- +How long the VM has been running, in seconds -Heap summary,which bytes was obtained from system. +type: long +-- -*`golang.heap.system.total`*:: +*`gcp.compute.instance.network.received_bytes_count.value`*:: + -- -Total bytes obtained from system (sum of XxxSys below). - +Count of bytes received from the network type: long -format: bytes - -- -*`golang.heap.system.obtained`*:: +*`gcp.compute.instance.network.received_packets_count.value`*:: + -- -Via HeapSys, bytes obtained from system. heap_sys = heap_idle + heap_inuse. - +Count of packets received from the network type: long -format: bytes - -- -*`golang.heap.system.stack`*:: +*`gcp.compute.instance.network.sent_bytes_count.value`*:: + -- -Bytes used by stack allocator, and these bytes was obtained from system. - +Count of bytes sent over the network type: long -format: bytes - -- -*`golang.heap.system.released`*:: +*`gcp.compute.instance.network.sent_packets_count.value`*:: + -- -Bytes released to the OS. - +Count of packets sent over the network type: long -format: bytes - -- -[float] -=== allocations -Heap allocations summary. - - - -*`golang.heap.allocations.mallocs`*:: +*`gcp.compute.instance.memory.balloon.ram_size.value`*:: + -- -Number of mallocs. - +The total amount of memory in the VM. This metric is only available for VMs that belong to the e2 family. type: long -- -*`golang.heap.allocations.frees`*:: +*`gcp.compute.instance.memory.balloon.ram_used.value`*:: + -- -Number of frees. - +Memory currently used in the VM. This metric is only available for VMs that belong to the e2 family. type: long -- -*`golang.heap.allocations.objects`*:: +*`gcp.compute.instance.memory.balloon.swap_in_bytes_count.value`*:: + -- -Total number of allocated objects. - +The amount of memory read into the guest from its own swap space. This metric is only available for VMs that belong to the e2 family. type: long -- -*`golang.heap.allocations.total`*:: +*`gcp.compute.instance.memory.balloon.swap_out_bytes_count.value`*:: + -- -Bytes allocated (even if freed) throughout the lifetime. - +The amount of memory written from the guest to its own swap space. This metric is only available for VMs that belong to the e2 family. type: long -format: bytes - -- -*`golang.heap.allocations.allocated`*:: -+ --- -Bytes allocated and not yet freed (same as Alloc above). +[float] +=== loadbalancing +Google Cloud Load Balancing metrics -type: long -format: bytes +[float] +=== https --- +Google Cloud Load Balancing metrics -*`golang.heap.allocations.idle`*:: + +*`gcp.loadbalancing.https.backend_request_bytes_count.value`*:: + -- -Bytes in idle spans. - +The number of bytes sent as requests from HTTP/S load balancer to backends. type: long -format: bytes - -- -*`golang.heap.allocations.active`*:: +*`gcp.loadbalancing.https.backend_request_count.value`*:: + -- -Bytes in non-idle span. - +The number of requests served by backends of HTTP/S load balancer. type: long -format: bytes - -- -[[exported-fields-googlecloud]] -== Google Cloud Platform fields - -GCP module - +*`gcp.loadbalancing.https.request_bytes_count.value`*:: ++ +-- +The number of bytes sent as requests from clients to HTTP/S load balancer. +type: long +-- -*`googlecloud.labels`*:: +*`gcp.loadbalancing.https.request_count.value`*:: + -- -Google cloud monitoring metrics labels - +The number of requests served by HTTP/S load balancer. -type: object +type: long -- -*`googlecloud.metrics.*.*.*.*`*:: +*`gcp.loadbalancing.https.response_bytes_count.value`*:: + -- -Metrics that returned from Google Cloud API query. - +The number of bytes sent as responses from HTTP/S load balancer to clients. -type: object +type: long -- [float] -=== billing +=== l3.internal -Google Cloud Billing metrics +Google Cloud Load Balancing metrics -*`googlecloud.billing.cost_type`*:: +*`gcp.loadbalancing.l3.internal.egress_bytes_count.value`*:: + -- -Cost types include regular, tax, adjustment, and rounding_error. +The number of bytes sent from ILB backend to client (for TCP flows it's counting bytes on application stream only). -type: keyword +type: long -- -*`googlecloud.billing.invoice_month`*:: +*`gcp.loadbalancing.l3.internal.egress_packets_count.value`*:: + -- -Billing report month. +The number of packets sent from ILB backend to client of the flow. -type: keyword +type: long -- -*`googlecloud.billing.project_id`*:: +*`gcp.loadbalancing.l3.internal.ingress_bytes_count.value`*:: + -- -Project ID of the billing report belongs to. +The number of bytes sent from client to ILB backend (for TCP flows it's counting bytes on application stream only). -type: keyword +type: long -- -*`googlecloud.billing.total`*:: +*`gcp.loadbalancing.l3.internal.ingress_packets_count.value`*:: + -- -Total billing amount. +The number of packets sent from client to ILB backend. -type: float +type: long -- [float] -=== compute - -Google Cloud Compute metrics - +=== tcp_ssl_proxy +Google Cloud Load Balancing metrics -*`googlecloud.compute.instance.firewall.dropped_bytes_count.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.closed_connections.value`*:: + -- -Incoming bytes dropped by the firewall +Number of connections that were terminated over TCP/SSL proxy. type: long -- -*`googlecloud.compute.instance.firewall.dropped_packets_count.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.egress_bytes_count.value`*:: + -- -Incoming packets dropped by the firewall +Number of bytes sent from VM to client using proxy. type: long -- - -*`googlecloud.compute.instance.cpu.reserved_cores.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.ingress_bytes_count.value`*:: + -- -Number of cores reserved on the host of the instance +Number of bytes sent from client to VM using proxy. -type: double +type: long -- -*`googlecloud.compute.instance.cpu.utilization.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.new_connections.value`*:: + -- -The fraction of the allocated CPU that is currently in use on the instance +Number of connections that were created over TCP/SSL proxy. -type: double +type: long -- -*`googlecloud.compute.instance.cpu.usage_time.value`*:: +*`gcp.loadbalancing.tcp_ssl_proxy.open_connections.value`*:: + -- -Usage for all cores in seconds +Current number of outstanding connections through the TCP/SSL proxy. -type: double +type: long -- +[float] +=== pubsub + +Google Cloud PubSub metrics + + +[float] +=== subscription + +Suscription related metrics + -*`googlecloud.compute.instance.disk.read_bytes_count.value`*:: +*`gcp.pubsub.subscription.ack_message_count.value`*:: + -- -Count of bytes read from disk +Cumulative count of messages acknowledged by Acknowledge requests, grouped by delivery type. type: long -- -*`googlecloud.compute.instance.disk.read_ops_count.value`*:: +*`gcp.pubsub.subscription.backlog_bytes.value`*:: + -- -Count of disk read IO operations +Total byte size of the unacknowledged messages (a.k.a. backlog messages) in a subscription. type: long -- -*`googlecloud.compute.instance.disk.write_bytes_count.value`*:: +*`gcp.pubsub.subscription.num_outstanding_messages.value`*:: + -- -Count of bytes written to disk +Number of messages delivered to a subscription's push endpoint, but not yet acknowledged. type: long -- -*`googlecloud.compute.instance.disk.write_ops_count.value`*:: +*`gcp.pubsub.subscription.num_undelivered_messages.value`*:: + -- -Count of disk write IO operations +Number of unacknowledged messages (a.k.a. backlog messages) in a subscription. type: long -- -*`googlecloud.compute.instance.uptime.value`*:: +*`gcp.pubsub.subscription.oldest_unacked_message_age.value`*:: + -- -How long the VM has been running, in seconds +Age (in seconds) of the oldest unacknowledged message (a.k.a. backlog message) in a subscription. type: long -- - -*`googlecloud.compute.instance.network.received_bytes_count.value`*:: +*`gcp.pubsub.subscription.pull_ack_message_operation_count.value`*:: + -- -Count of bytes received from the network +Cumulative count of acknowledge message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. type: long -- -*`googlecloud.compute.instance.network.received_packets_count.value`*:: +*`gcp.pubsub.subscription.pull_ack_request_count.value`*:: + -- -Count of packets received from the network +Cumulative count of acknowledge requests, grouped by result. type: long -- -*`googlecloud.compute.instance.network.sent_bytes_count.value`*:: +*`gcp.pubsub.subscription.pull_message_operation_count.value`*:: + -- -Count of bytes sent over the network +Cumulative count of pull message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. type: long -- -*`googlecloud.compute.instance.network.sent_packets_count.value`*:: +*`gcp.pubsub.subscription.pull_request_count.value`*:: + -- -Count of packets sent over the network +Cumulative count of pull requests, grouped by result. type: long -- - -*`googlecloud.compute.instance.memory.balloon.ram_size.value`*:: +*`gcp.pubsub.subscription.push_request_count.value`*:: + -- -The total amount of memory in the VM. This metric is only available for VMs that belong to the e2 family. +Cumulative count of push attempts, grouped by result. Unlike pulls, the push server implementation does not batch user messages. So each request only contains one user message. The push server retries on errors, so a given user message can appear multiple times. type: long -- -*`googlecloud.compute.instance.memory.balloon.ram_used.value`*:: +*`gcp.pubsub.subscription.push_request_latencies.value`*:: + -- -Memory currently used in the VM. This metric is only available for VMs that belong to the e2 family. +Distribution of push request latencies (in microseconds), grouped by result. type: long -- -*`googlecloud.compute.instance.memory.balloon.swap_in_bytes_count.value`*:: +*`gcp.pubsub.subscription.sent_message_count.value`*:: + -- -The amount of memory read into the guest from its own swap space. This metric is only available for VMs that belong to the e2 family. +Cumulative count of messages sent by Cloud Pub/Sub to subscriber clients, grouped by delivery type. type: long -- -*`googlecloud.compute.instance.memory.balloon.swap_out_bytes_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_ack_message_operation_count.value`*:: + -- -The amount of memory written from the guest to its own swap space. This metric is only available for VMs that belong to the e2 family. +Cumulative count of StreamingPull acknowledge message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. type: long -- -[float] -=== loadbalancing - -Google Cloud Load Balancing metrics - - -[float] -=== https +*`gcp.pubsub.subscription.streaming_pull_ack_request_count.value`*:: ++ +-- +Cumulative count of streaming pull requests with non-empty acknowledge ids, grouped by result. -Google Cloud Load Balancing metrics +type: long +-- -*`googlecloud.loadbalancing.https.backend_request_bytes_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_message_operation_count.value`*:: + -- -The number of bytes sent as requests from HTTP/S load balancer to backends. +Cumulative count of streaming pull message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count type: long -- -*`googlecloud.loadbalancing.https.backend_request_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_response_count.value`*:: + -- -The number of requests served by backends of HTTP/S load balancer. +Cumulative count of streaming pull responses, grouped by result. type: long -- -*`googlecloud.loadbalancing.https.request_bytes_count.value`*:: +*`gcp.pubsub.subscription.dead_letter_message_count.value`*:: + -- -The number of bytes sent as requests from clients to HTTP/S load balancer. +Cumulative count of messages published to dead letter topic, grouped by result. type: long -- -*`googlecloud.loadbalancing.https.request_count.value`*:: +*`gcp.pubsub.subscription.mod_ack_deadline_message_count.value`*:: + -- -The number of requests served by HTTP/S load balancer. +Cumulative count of messages whose deadline was updated by ModifyAckDeadline requests, grouped by delivery type. type: long -- -*`googlecloud.loadbalancing.https.response_bytes_count.value`*:: +*`gcp.pubsub.subscription.mod_ack_deadline_message_operation_count.value`*:: + -- -The number of bytes sent as responses from HTTP/S load balancer to clients. +Cumulative count of ModifyAckDeadline message operations, grouped by result. type: long -- -[float] -=== l3.internal +*`gcp.pubsub.subscription.mod_ack_deadline_request_count.value`*:: ++ +-- +Cumulative count of ModifyAckDeadline requests, grouped by result. -Google Cloud Load Balancing metrics +type: long +-- -*`googlecloud.loadbalancing.l3.internal.egress_bytes_count.value`*:: +*`gcp.pubsub.subscription.oldest_retained_acked_message_age.value`*:: + -- -The number of bytes sent from ILB backend to client (for TCP flows it's counting bytes on application stream only). +Age (in seconds) of the oldest acknowledged message retained in a subscription. type: long -- -*`googlecloud.loadbalancing.l3.internal.egress_packets_count.value`*:: +*`gcp.pubsub.subscription.oldest_retained_acked_message_age_by_region.value`*:: + -- -The number of packets sent from ILB backend to client of the flow. +Age (in seconds) of the oldest acknowledged message retained in a subscription, broken down by Cloud region. type: long -- -*`googlecloud.loadbalancing.l3.internal.ingress_bytes_count.value`*:: +*`gcp.pubsub.subscription.oldest_unacked_message_age_by_region.value`*:: + -- -The number of bytes sent from client to ILB backend (for TCP flows it's counting bytes on application stream only). +Age (in seconds) of the oldest unacknowledged message in a subscription, broken down by Cloud region. type: long -- -*`googlecloud.loadbalancing.l3.internal.ingress_packets_count.value`*:: +*`gcp.pubsub.subscription.retained_acked_bytes.value`*:: + -- -The number of packets sent from client to ILB backend. +Total byte size of the acknowledged messages retained in a subscription. type: long -- -[float] -=== tcp_ssl_proxy +*`gcp.pubsub.subscription.retained_acked_bytes_by_region.value`*:: ++ +-- +Total byte size of the acknowledged messages retained in a subscription, broken down by Cloud region. -Google Cloud Load Balancing metrics +type: long +-- -*`googlecloud.loadbalancing.tcp_ssl_proxy.closed_connections.value`*:: +*`gcp.pubsub.subscription.seek_request_count.value`*:: + -- -Number of connections that were terminated over TCP/SSL proxy. +Cumulative count of seek attempts, grouped by result. type: long -- -*`googlecloud.loadbalancing.tcp_ssl_proxy.egress_bytes_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_mod_ack_deadline_message_operation_count.value`*:: + -- -Number of bytes sent from VM to client using proxy. +Cumulative count of StreamingPull ModifyAckDeadline operations, grouped by result. type: long -- -*`googlecloud.loadbalancing.tcp_ssl_proxy.ingress_bytes_count.value`*:: +*`gcp.pubsub.subscription.streaming_pull_mod_ack_deadline_request_count.value`*:: + -- -Number of bytes sent from client to VM using proxy. +Cumulative count of streaming pull requests with non-empty ModifyAckDeadline fields, grouped by result. type: long -- -*`googlecloud.loadbalancing.tcp_ssl_proxy.new_connections.value`*:: +*`gcp.pubsub.subscription.byte_cost.value`*:: + -- -Number of connections that were created over TCP/SSL proxy. +Cumulative cost of operations, measured in bytes. This is used to measure quota utilization. type: long -- -*`googlecloud.loadbalancing.tcp_ssl_proxy.open_connections.value`*:: +*`gcp.pubsub.subscription.config_updates_count.value`*:: + -- -Current number of outstanding connections through the TCP/SSL proxy. +Cumulative count of configuration changes for each subscription, grouped by operation type and result. type: long -- -[float] -=== pubsub +*`gcp.pubsub.subscription.unacked_bytes_by_region.value`*:: ++ +-- +Total byte size of the unacknowledged messages in a subscription, broken down by Cloud region. -Google Cloud PubSub metrics +type: long +-- [float] -=== subscription +=== topic -Suscription related metrics +Topic related metrics -*`googlecloud.pubsub.subscription.ack_message_count.value`*:: +*`gcp.pubsub.topic.streaming_pull_response_count.value`*:: + -- -Cumulative count of messages acknowledged by Acknowledge requests, grouped by delivery type. +Cumulative count of streaming pull responses, grouped by result. type: long -- -*`googlecloud.pubsub.subscription.backlog_bytes.value`*:: +*`gcp.pubsub.topic.send_message_operation_count.value`*:: + -- -Total byte size of the unacknowledged messages (a.k.a. backlog messages) in a subscription. +Cumulative count of publish message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. type: long -- -*`googlecloud.pubsub.subscription.num_outstanding_messages.value`*:: +*`gcp.pubsub.topic.send_request_count.value`*:: + -- -Number of messages delivered to a subscription's push endpoint, but not yet acknowledged. +Cumulative count of publish requests, grouped by result. type: long -- -*`googlecloud.pubsub.subscription.num_undelivered_messages.value`*:: +*`gcp.pubsub.topic.oldest_retained_acked_message_age_by_region.value`*:: + -- -Number of unacknowledged messages (a.k.a. backlog messages) in a subscription. +Age (in seconds) of the oldest acknowledged message retained in a topic, broken down by Cloud region. type: long -- -*`googlecloud.pubsub.subscription.oldest_unacked_message_age.value`*:: +*`gcp.pubsub.topic.oldest_unacked_message_age_by_region.value`*:: + -- -Age (in seconds) of the oldest unacknowledged message (a.k.a. backlog message) in a subscription. +Age (in seconds) of the oldest unacknowledged message in a topic, broken down by Cloud region. type: long -- -*`googlecloud.pubsub.subscription.pull_ack_message_operation_count.value`*:: +*`gcp.pubsub.topic.retained_acked_bytes_by_region.value`*:: + -- -Cumulative count of acknowledge message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. +Total byte size of the acknowledged messages retained in a topic, broken down by Cloud region. type: long -- -*`googlecloud.pubsub.subscription.pull_ack_request_count.value`*:: +*`gcp.pubsub.topic.byte_cost.value`*:: + -- -Cumulative count of acknowledge requests, grouped by result. +Cost of operations, measured in bytes. This is used to measure utilization for quotas. type: long -- -*`googlecloud.pubsub.subscription.pull_message_operation_count.value`*:: +*`gcp.pubsub.topic.config_updates_count.value`*:: + -- -Cumulative count of pull message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. +Cumulative count of configuration changes, grouped by operation type and result. type: long -- -*`googlecloud.pubsub.subscription.pull_request_count.value`*:: +*`gcp.pubsub.topic.message_sizes.value`*:: + -- -Cumulative count of pull requests, grouped by result. +Distribution of publish message sizes (in bytes) type: long -- -*`googlecloud.pubsub.subscription.push_request_count.value`*:: +*`gcp.pubsub.topic.unacked_bytes_by_region.value`*:: + -- -Cumulative count of push attempts, grouped by result. Unlike pulls, the push server implementation does not batch user messages. So each request only contains one user message. The push server retries on errors, so a given user message can appear multiple times. +Total byte size of the unacknowledged messages in a topic, broken down by Cloud region. type: long -- -*`googlecloud.pubsub.subscription.push_request_latencies.value`*:: -+ --- -Distribution of push request latencies (in microseconds), grouped by result. +[float] +=== snapshot -type: long +Snapshot related metrics --- -*`googlecloud.pubsub.subscription.sent_message_count.value`*:: +*`gcp.pubsub.snapshot.oldest_message_age.value`*:: + -- -Cumulative count of messages sent by Cloud Pub/Sub to subscriber clients, grouped by delivery type. +Age (in seconds) of the oldest message retained in a snapshot. type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_ack_message_operation_count.value`*:: +*`gcp.pubsub.snapshot.oldest_message_age_by_region.value`*:: + -- -Cumulative count of StreamingPull acknowledge message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. +Age (in seconds) of the oldest message retained in a snapshot, broken down by Cloud region. type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_ack_request_count.value`*:: +*`gcp.pubsub.snapshot.backlog_bytes.value`*:: + -- -Cumulative count of streaming pull requests with non-empty acknowledge ids, grouped by result. +Total byte size of the messages retained in a snapshot. type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_message_operation_count.value`*:: +*`gcp.pubsub.snapshot.backlog_bytes_by_region.value`*:: + -- -Cumulative count of streaming pull message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count +Total byte size of the messages retained in a snapshot, broken down by Cloud region. type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_response_count.value`*:: +*`gcp.pubsub.snapshot.num_messages.value`*:: + -- -Cumulative count of streaming pull responses, grouped by result. +Number of messages retained in a snapshot. type: long -- -*`googlecloud.pubsub.subscription.dead_letter_message_count.value`*:: +*`gcp.pubsub.snapshot.num_messages_by_region.value`*:: + -- -Cumulative count of messages published to dead letter topic, grouped by result. +Number of messages retained in a snapshot, broken down by Cloud region. type: long -- -*`googlecloud.pubsub.subscription.mod_ack_deadline_message_count.value`*:: +*`gcp.pubsub.snapshot.config_updates_count.value`*:: + -- -Cumulative count of messages whose deadline was updated by ModifyAckDeadline requests, grouped by delivery type. +Cumulative count of configuration changes, grouped by operation type and result. type: long -- -*`googlecloud.pubsub.subscription.mod_ack_deadline_message_operation_count.value`*:: -+ --- -Cumulative count of ModifyAckDeadline message operations, grouped by result. +[float] +=== storage + +Google Cloud Storage metrics -type: long --- -*`googlecloud.pubsub.subscription.mod_ack_deadline_request_count.value`*:: +*`gcp.storage.api.request_count.value`*:: + -- -Cumulative count of ModifyAckDeadline requests, grouped by result. +Delta count of API calls, grouped by the API method name and response code. type: long -- -*`googlecloud.pubsub.subscription.oldest_retained_acked_message_age.value`*:: + +*`gcp.storage.authz.acl_based_object_access_count.value`*:: + -- -Age (in seconds) of the oldest acknowledged message retained in a subscription. +Delta count of requests that result in an object being granted access solely due to object ACLs. type: long -- -*`googlecloud.pubsub.subscription.oldest_retained_acked_message_age_by_region.value`*:: +*`gcp.storage.authz.acl_operations_count.value`*:: + -- -Age (in seconds) of the oldest acknowledged message retained in a subscription, broken down by Cloud region. +Usage of ACL operations broken down by type. type: long -- -*`googlecloud.pubsub.subscription.oldest_unacked_message_age_by_region.value`*:: +*`gcp.storage.authz.object_specific_acl_mutation_count.value`*:: + -- -Age (in seconds) of the oldest unacknowledged message in a subscription, broken down by Cloud region. +Delta count of changes made to object specific ACLs. type: long -- -*`googlecloud.pubsub.subscription.retained_acked_bytes.value`*:: + +*`gcp.storage.network.received_bytes_count.value`*:: + -- -Total byte size of the acknowledged messages retained in a subscription. +Delta count of bytes received over the network, grouped by the API method name and response code. type: long -- -*`googlecloud.pubsub.subscription.retained_acked_bytes_by_region.value`*:: +*`gcp.storage.network.sent_bytes_count.value`*:: + -- -Total byte size of the acknowledged messages retained in a subscription, broken down by Cloud region. +Delta count of bytes sent over the network, grouped by the API method name and response code. type: long -- -*`googlecloud.pubsub.subscription.seek_request_count.value`*:: + +*`gcp.storage.storage.object_count.value`*:: + -- -Cumulative count of seek attempts, grouped by result. +Total number of objects per bucket, grouped by storage class. This value is measured once per day, and the value is repeated at each sampling interval throughout the day. type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_mod_ack_deadline_message_operation_count.value`*:: +*`gcp.storage.storage.total_byte_seconds.value`*:: + -- -Cumulative count of StreamingPull ModifyAckDeadline operations, grouped by result. +Delta count of bytes received over the network, grouped by the API method name and response code. type: long -- -*`googlecloud.pubsub.subscription.streaming_pull_mod_ack_deadline_request_count.value`*:: +*`gcp.storage.storage.total_bytes.value`*:: + -- -Cumulative count of streaming pull requests with non-empty ModifyAckDeadline fields, grouped by result. +Total size of all objects in the bucket, grouped by storage class. This value is measured once per day, and the value is repeated at each sampling interval throughout the day. type: long -- -*`googlecloud.pubsub.subscription.byte_cost.value`*:: -+ --- -Cumulative cost of operations, measured in bytes. This is used to measure quota utilization. +[[exported-fields-golang]] +== Golang fields -type: long +Golang module --- -*`googlecloud.pubsub.subscription.config_updates_count.value`*:: -+ --- -Cumulative count of configuration changes for each subscription, grouped by operation type and result. -type: long +[float] +=== golang + + + + +[float] +=== expvar + +expvar --- -*`googlecloud.pubsub.subscription.unacked_bytes_by_region.value`*:: + +*`golang.expvar.cmdline`*:: + -- -Total byte size of the unacknowledged messages in a subscription, broken down by Cloud region. +The cmdline of this Go program start with. -type: long + +type: keyword -- [float] -=== topic +=== heap + +The Go program heap information exposed by expvar. -Topic related metrics -*`googlecloud.pubsub.topic.streaming_pull_response_count.value`*:: +*`golang.heap.cmdline`*:: + -- -Cumulative count of streaming pull responses, grouped by result. +The cmdline of this Go program start with. -type: long --- +type: keyword -*`googlecloud.pubsub.topic.send_message_operation_count.value`*:: -+ -- -Cumulative count of publish message operations, grouped by result. For a definition of message operations, see Cloud Pub/Sub metric subscription/mod_ack_deadline_message_operation_count. -type: long +[float] +=== gc --- +Garbage collector summary. -*`googlecloud.pubsub.topic.send_request_count.value`*:: -+ --- -Cumulative count of publish requests, grouped by result. -type: long --- +[float] +=== total_pause -*`googlecloud.pubsub.topic.oldest_retained_acked_message_age_by_region.value`*:: -+ --- -Age (in seconds) of the oldest acknowledged message retained in a topic, broken down by Cloud region. +Total GC pause duration over lifetime of process. -type: long --- -*`googlecloud.pubsub.topic.oldest_unacked_message_age_by_region.value`*:: +*`golang.heap.gc.total_pause.ns`*:: + -- -Age (in seconds) of the oldest unacknowledged message in a topic, broken down by Cloud region. +Duration in Ns. + type: long -- -*`googlecloud.pubsub.topic.retained_acked_bytes_by_region.value`*:: +*`golang.heap.gc.total_count`*:: + -- -Total byte size of the acknowledged messages retained in a topic, broken down by Cloud region. +Total number of GC was happened. + type: long -- -*`googlecloud.pubsub.topic.byte_cost.value`*:: +*`golang.heap.gc.next_gc_limit`*:: + -- -Cost of operations, measured in bytes. This is used to measure utilization for quotas. +Next collection will happen when HeapAlloc > this amount. + type: long +format: bytes + -- -*`googlecloud.pubsub.topic.config_updates_count.value`*:: +*`golang.heap.gc.cpu_fraction`*:: + -- -Cumulative count of configuration changes, grouped by operation type and result. +Fraction of CPU time used by GC. -type: long --- +type: float -*`googlecloud.pubsub.topic.message_sizes.value`*:: -+ -- -Distribution of publish message sizes (in bytes) -type: long +[float] +=== pause + +Last GC pause durations during the monitoring period. --- -*`googlecloud.pubsub.topic.unacked_bytes_by_region.value`*:: + +*`golang.heap.gc.pause.count`*:: + -- -Total byte size of the unacknowledged messages in a topic, broken down by Cloud region. +Count of GC pause duration during this collect period. + type: long -- [float] -=== snapshot +=== sum + +Total GC pause duration during this collect period. -Snapshot related metrics -*`googlecloud.pubsub.snapshot.oldest_message_age.value`*:: +*`golang.heap.gc.pause.sum.ns`*:: + -- -Age (in seconds) of the oldest message retained in a snapshot. +Duration in Ns. + type: long -- -*`googlecloud.pubsub.snapshot.oldest_message_age_by_region.value`*:: -+ --- -Age (in seconds) of the oldest message retained in a snapshot, broken down by Cloud region. +[float] +=== max -type: long +Max GC pause duration during this collect period. --- -*`googlecloud.pubsub.snapshot.backlog_bytes.value`*:: + +*`golang.heap.gc.pause.max.ns`*:: + -- -Total byte size of the messages retained in a snapshot. +Duration in Ns. + type: long -- -*`googlecloud.pubsub.snapshot.backlog_bytes_by_region.value`*:: -+ --- -Total byte size of the messages retained in a snapshot, broken down by Cloud region. +[float] +=== avg + +Average GC pause duration during this collect period. -type: long --- -*`googlecloud.pubsub.snapshot.num_messages.value`*:: +*`golang.heap.gc.pause.avg.ns`*:: + -- -Number of messages retained in a snapshot. +Duration in Ns. + type: long -- -*`googlecloud.pubsub.snapshot.num_messages_by_region.value`*:: +[float] +=== system + +Heap summary,which bytes was obtained from system. + + + +*`golang.heap.system.total`*:: + -- -Number of messages retained in a snapshot, broken down by Cloud region. +Total bytes obtained from system (sum of XxxSys below). + type: long +format: bytes + -- -*`googlecloud.pubsub.snapshot.config_updates_count.value`*:: +*`golang.heap.system.obtained`*:: + -- -Cumulative count of configuration changes, grouped by operation type and result. +Via HeapSys, bytes obtained from system. heap_sys = heap_idle + heap_inuse. + type: long +format: bytes + -- -[float] -=== storage +*`golang.heap.system.stack`*:: ++ +-- +Bytes used by stack allocator, and these bytes was obtained from system. -Google Cloud Storage metrics +type: long + +format: bytes +-- -*`googlecloud.storage.api.request_count.value`*:: +*`golang.heap.system.released`*:: + -- -Delta count of API calls, grouped by the API method name and response code. +Bytes released to the OS. + type: long +format: bytes + -- +[float] +=== allocations -*`googlecloud.storage.authz.acl_based_object_access_count.value`*:: -+ --- -Delta count of requests that result in an object being granted access solely due to object ACLs. +Heap allocations summary. -type: long --- -*`googlecloud.storage.authz.acl_operations_count.value`*:: +*`golang.heap.allocations.mallocs`*:: + -- -Usage of ACL operations broken down by type. +Number of mallocs. + type: long -- -*`googlecloud.storage.authz.object_specific_acl_mutation_count.value`*:: +*`golang.heap.allocations.frees`*:: + -- -Delta count of changes made to object specific ACLs. +Number of frees. + type: long -- - -*`googlecloud.storage.network.received_bytes_count.value`*:: +*`golang.heap.allocations.objects`*:: + -- -Delta count of bytes received over the network, grouped by the API method name and response code. +Total number of allocated objects. + type: long -- -*`googlecloud.storage.network.sent_bytes_count.value`*:: +*`golang.heap.allocations.total`*:: + -- -Delta count of bytes sent over the network, grouped by the API method name and response code. +Bytes allocated (even if freed) throughout the lifetime. + type: long --- +format: bytes +-- -*`googlecloud.storage.storage.object_count.value`*:: +*`golang.heap.allocations.allocated`*:: + -- -Total number of objects per bucket, grouped by storage class. This value is measured once per day, and the value is repeated at each sampling interval throughout the day. +Bytes allocated and not yet freed (same as Alloc above). + type: long +format: bytes + -- -*`googlecloud.storage.storage.total_byte_seconds.value`*:: +*`golang.heap.allocations.idle`*:: + -- -Delta count of bytes received over the network, grouped by the API method name and response code. +Bytes in idle spans. + type: long +format: bytes + -- -*`googlecloud.storage.storage.total_bytes.value`*:: +*`golang.heap.allocations.active`*:: + -- -Total size of all objects in the bucket, grouped by storage class. This value is measured once per day, and the value is repeated at each sampling interval throughout the day. +Bytes in non-idle span. + type: long +format: bytes + -- [[exported-fields-graphite]] diff --git a/metricbeat/docs/images/metricbeat-googlecloud-billing-overview.png b/metricbeat/docs/images/metricbeat-gcp-billing-overview.png similarity index 100% rename from metricbeat/docs/images/metricbeat-googlecloud-billing-overview.png rename to metricbeat/docs/images/metricbeat-gcp-billing-overview.png diff --git a/metricbeat/docs/images/metricbeat-googlecloud-compute-overview.png b/metricbeat/docs/images/metricbeat-gcp-compute-overview.png similarity index 100% rename from metricbeat/docs/images/metricbeat-googlecloud-compute-overview.png rename to metricbeat/docs/images/metricbeat-gcp-compute-overview.png diff --git a/metricbeat/docs/images/metricbeat-googlecloud-load-balancing-https-overview.png b/metricbeat/docs/images/metricbeat-gcp-load-balancing-https-overview.png similarity index 100% rename from metricbeat/docs/images/metricbeat-googlecloud-load-balancing-https-overview.png rename to metricbeat/docs/images/metricbeat-gcp-load-balancing-https-overview.png diff --git a/metricbeat/docs/images/metricbeat-googlecloud-load-balancing-l3-overview.png b/metricbeat/docs/images/metricbeat-gcp-load-balancing-l3-overview.png similarity index 100% rename from metricbeat/docs/images/metricbeat-googlecloud-load-balancing-l3-overview.png rename to metricbeat/docs/images/metricbeat-gcp-load-balancing-l3-overview.png diff --git a/metricbeat/docs/images/metricbeat-googlecloud-load-balancing-tcp-ssl-proxy-overview.png b/metricbeat/docs/images/metricbeat-gcp-load-balancing-tcp-ssl-proxy-overview.png similarity index 100% rename from metricbeat/docs/images/metricbeat-googlecloud-load-balancing-tcp-ssl-proxy-overview.png rename to metricbeat/docs/images/metricbeat-gcp-load-balancing-tcp-ssl-proxy-overview.png diff --git a/metricbeat/docs/images/metricbeat-googlecloud-pubsub-overview.png b/metricbeat/docs/images/metricbeat-gcp-pubsub-overview.png similarity index 100% rename from metricbeat/docs/images/metricbeat-googlecloud-pubsub-overview.png rename to metricbeat/docs/images/metricbeat-gcp-pubsub-overview.png diff --git a/metricbeat/docs/images/metricbeat-googlecloud-storage-overview.png b/metricbeat/docs/images/metricbeat-gcp-storage-overview.png similarity index 100% rename from metricbeat/docs/images/metricbeat-googlecloud-storage-overview.png rename to metricbeat/docs/images/metricbeat-gcp-storage-overview.png diff --git a/metricbeat/docs/modules/googlecloud.asciidoc b/metricbeat/docs/modules/gcp.asciidoc similarity index 89% rename from metricbeat/docs/modules/googlecloud.asciidoc rename to metricbeat/docs/modules/gcp.asciidoc index ce450aee4ca..ded907e5bf9 100644 --- a/metricbeat/docs/modules/googlecloud.asciidoc +++ b/metricbeat/docs/modules/gcp.asciidoc @@ -2,7 +2,7 @@ This file is generated! See scripts/mage/docs_collector.go //// -[[metricbeat-module-googlecloud]] +[[metricbeat-module-gcp]] [role="xpack"] == Google Cloud Platform module @@ -53,7 +53,7 @@ in `elastic-observability` project. + [source,yaml] ---- -- module: googlecloud +- module: gcp metricsets: - compute zone: "us-central1-a" @@ -68,7 +68,7 @@ under `us-central1` region in `elastic-observability` project. + [source,yaml] ---- -- module: googlecloud +- module: gcp metricsets: - compute - pubsub @@ -85,7 +85,7 @@ under `us-central1` region in `elastic-observability` project. + [source,yaml] ---- -- module: googlecloud +- module: gcp metricsets: - compute - pubsub @@ -138,7 +138,7 @@ If you also want to *extract service labels* (by setting `exclude_labels` to fal If `period` value is set to 5-minute and sample period of the metric type is 60-second, then this module will collect data from this metric type once every 5 minutes with aggregation. GCP monitoring data has a up to 240 seconds latency, which means latest monitoring data will be up to 4 minutes old. Please see https://cloud.google.com/monitoring/api/v3/latency-n-retention[Latency of GCP Monitoring Metric Data] for more details. -In googlecloud module, metrics are collected based on this ingest delay, which is also obtained from ListMetricDescriptors API. +In `gcp` module, metrics are collected based on this ingest delay, which is also obtained from ListMetricDescriptors API. [float] [[gcp-api-requests]] @@ -150,7 +150,7 @@ For example, if Compute Metricset fetches 14 metrics (which is the number of met [float] == Metricsets Currently, we have `billing`, `compute`, `loadbalancing`, `pubsub`, `metrics` and -`storage` metricset in `googlecloud` module. +`storage` metricset in `gcp` module. [float] === `billing` @@ -161,7 +161,7 @@ periodically to export billing metrics for further analysis. The `billing` metricset comes with a predefined dashboard: -image::./images/metricbeat-googlecloud-billing-overview.png[] +image::./images/metricbeat-gcp-billing-overview.png[] [float] === `compute` @@ -174,7 +174,7 @@ labels and metadata and metric specific Labels. The `compute` metricset comes with a predefined dashboard: -image::./images/metricbeat-googlecloud-compute-overview.png[] +image::./images/metricbeat-gcp-compute-overview.png[] [float] === `loadbalancing` @@ -187,17 +187,17 @@ The `loadbalancing` metricset comes with two predefined dashboards: [float] ==== HTTPS For HTTPS load balancing: -image::./images/metricbeat-googlecloud-load-balancing-https-overview.png[] +image::./images/metricbeat-gcp-load-balancing-https-overview.png[] [float] ==== L3 For L3 load balancing: -image::./images/metricbeat-googlecloud-load-balancing-l3-overview.png[] +image::./images/metricbeat-gcp-load-balancing-l3-overview.png[] [float] ==== TCP/SSL/Proxy For TCP/SSL/Proxy load balancing: -image::./images/metricbeat-googlecloud-load-balancing-tcp-ssl-proxy-overview.png[] +image::./images/metricbeat-gcp-load-balancing-tcp-ssl-proxy-overview.png[] [float] === `pubsub` @@ -208,7 +208,7 @@ https://cloud.google.com/monitoring/api/metrics_gcp#gcp-pubsub[GCP PubSub Monito The `pubsub` metricset comes with a predefined dashboard: -image::./images/metricbeat-googlecloud-pubsub-overview.png[] +image::./images/metricbeat-gcp-pubsub-overview.png[] [float] === `metrics` @@ -231,7 +231,7 @@ a 10-minute ingest delay. The `storage` metricset comes with a predefined dashboard: -image::./images/metricbeat-googlecloud-storage-overview.png[] +image::./images/metricbeat-gcp-storage-overview.png[] [float] @@ -243,7 +243,7 @@ in <>. Here is an example configuration: [source,yaml] ---- metricbeat.modules: -- module: googlecloud +- module: gcp metricsets: - compute region: "us-" @@ -252,7 +252,7 @@ metricbeat.modules: exclude_labels: false period: 1m -- module: googlecloud +- module: gcp metricsets: - pubsub - loadbalancing @@ -262,7 +262,7 @@ metricbeat.modules: exclude_labels: false period: 1m -- module: googlecloud +- module: gcp metricsets: - storage project_id: "your project id" @@ -270,7 +270,7 @@ metricbeat.modules: exclude_labels: false period: 5m -- module: googlecloud +- module: gcp metricsets: - metrics project_id: "your project id" @@ -286,7 +286,7 @@ metricbeat.modules: - "instance/cpu/utilization" - "instance/uptime" -- module: googlecloud +- module: gcp metricsets: - billing period: 24h @@ -302,27 +302,27 @@ metricbeat.modules: The following metricsets are available: -* <> +* <> -* <> +* <> -* <> +* <> -* <> +* <> -* <> +* <> -* <> +* <> -include::googlecloud/billing.asciidoc[] +include::gcp/billing.asciidoc[] -include::googlecloud/compute.asciidoc[] +include::gcp/compute.asciidoc[] -include::googlecloud/loadbalancing.asciidoc[] +include::gcp/loadbalancing.asciidoc[] -include::googlecloud/metrics.asciidoc[] +include::gcp/metrics.asciidoc[] -include::googlecloud/pubsub.asciidoc[] +include::gcp/pubsub.asciidoc[] -include::googlecloud/storage.asciidoc[] +include::gcp/storage.asciidoc[] diff --git a/metricbeat/docs/modules/googlecloud/billing.asciidoc b/metricbeat/docs/modules/gcp/billing.asciidoc similarity index 51% rename from metricbeat/docs/modules/googlecloud/billing.asciidoc rename to metricbeat/docs/modules/gcp/billing.asciidoc index cfb91238840..a4ba4ebc0a8 100644 --- a/metricbeat/docs/modules/googlecloud/billing.asciidoc +++ b/metricbeat/docs/modules/gcp/billing.asciidoc @@ -2,23 +2,23 @@ This file is generated! See scripts/mage/docs_collector.go //// -[[metricbeat-metricset-googlecloud-billing]] +[[metricbeat-metricset-gcp-billing]] [role="xpack"] === Google Cloud Platform billing metricset beta[] -include::../../../../x-pack/metricbeat/module/googlecloud/billing/_meta/docs.asciidoc[] +include::../../../../x-pack/metricbeat/module/gcp/billing/_meta/docs.asciidoc[] ==== Fields For a description of each field in the metricset, see the -<> section. +<> section. Here is an example document generated by this metricset: [source,json] ---- -include::../../../../x-pack/metricbeat/module/googlecloud/billing/_meta/data.json[] +include::../../../../x-pack/metricbeat/module/gcp/billing/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/googlecloud/compute.asciidoc b/metricbeat/docs/modules/gcp/compute.asciidoc similarity index 59% rename from metricbeat/docs/modules/googlecloud/compute.asciidoc rename to metricbeat/docs/modules/gcp/compute.asciidoc index bd8e4202788..7edd443a0a1 100644 --- a/metricbeat/docs/modules/googlecloud/compute.asciidoc +++ b/metricbeat/docs/modules/gcp/compute.asciidoc @@ -2,24 +2,24 @@ This file is generated! See scripts/mage/docs_collector.go //// -[[metricbeat-metricset-googlecloud-compute]] +[[metricbeat-metricset-gcp-compute]] [role="xpack"] === Google Cloud Platform compute metricset beta[] -include::../../../../x-pack/metricbeat/module/googlecloud/compute/_meta/docs.asciidoc[] +include::../../../../x-pack/metricbeat/module/gcp/compute/_meta/docs.asciidoc[] This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields For a description of each field in the metricset, see the -<> section. +<> section. Here is an example document generated by this metricset: [source,json] ---- -include::../../../../x-pack/metricbeat/module/googlecloud/compute/_meta/data.json[] +include::../../../../x-pack/metricbeat/module/gcp/compute/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/googlecloud/loadbalancing.asciidoc b/metricbeat/docs/modules/gcp/loadbalancing.asciidoc similarity index 50% rename from metricbeat/docs/modules/googlecloud/loadbalancing.asciidoc rename to metricbeat/docs/modules/gcp/loadbalancing.asciidoc index f6cdbcb5f6e..6622dde3124 100644 --- a/metricbeat/docs/modules/googlecloud/loadbalancing.asciidoc +++ b/metricbeat/docs/modules/gcp/loadbalancing.asciidoc @@ -2,23 +2,23 @@ This file is generated! See scripts/mage/docs_collector.go //// -[[metricbeat-metricset-googlecloud-loadbalancing]] +[[metricbeat-metricset-gcp-loadbalancing]] [role="xpack"] === Google Cloud Platform loadbalancing metricset beta[] -include::../../../../x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/docs.asciidoc[] +include::../../../../x-pack/metricbeat/module/gcp/loadbalancing/_meta/docs.asciidoc[] ==== Fields For a description of each field in the metricset, see the -<> section. +<> section. Here is an example document generated by this metricset: [source,json] ---- -include::../../../../x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/data.json[] +include::../../../../x-pack/metricbeat/module/gcp/loadbalancing/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/googlecloud/metrics.asciidoc b/metricbeat/docs/modules/gcp/metrics.asciidoc similarity index 51% rename from metricbeat/docs/modules/googlecloud/metrics.asciidoc rename to metricbeat/docs/modules/gcp/metrics.asciidoc index 404c35a430d..ade3ed1a1e2 100644 --- a/metricbeat/docs/modules/googlecloud/metrics.asciidoc +++ b/metricbeat/docs/modules/gcp/metrics.asciidoc @@ -2,23 +2,23 @@ This file is generated! See scripts/mage/docs_collector.go //// -[[metricbeat-metricset-googlecloud-metrics]] +[[metricbeat-metricset-gcp-metrics]] [role="xpack"] === Google Cloud Platform metrics metricset beta[] -include::../../../../x-pack/metricbeat/module/googlecloud/metrics/_meta/docs.asciidoc[] +include::../../../../x-pack/metricbeat/module/gcp/metrics/_meta/docs.asciidoc[] ==== Fields For a description of each field in the metricset, see the -<> section. +<> section. Here is an example document generated by this metricset: [source,json] ---- -include::../../../../x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json[] +include::../../../../x-pack/metricbeat/module/gcp/metrics/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/googlecloud/pubsub.asciidoc b/metricbeat/docs/modules/gcp/pubsub.asciidoc similarity index 59% rename from metricbeat/docs/modules/googlecloud/pubsub.asciidoc rename to metricbeat/docs/modules/gcp/pubsub.asciidoc index 605d4fae7ec..c4c6d2280ad 100644 --- a/metricbeat/docs/modules/googlecloud/pubsub.asciidoc +++ b/metricbeat/docs/modules/gcp/pubsub.asciidoc @@ -2,24 +2,24 @@ This file is generated! See scripts/mage/docs_collector.go //// -[[metricbeat-metricset-googlecloud-pubsub]] +[[metricbeat-metricset-gcp-pubsub]] [role="xpack"] === Google Cloud Platform pubsub metricset beta[] -include::../../../../x-pack/metricbeat/module/googlecloud/pubsub/_meta/docs.asciidoc[] +include::../../../../x-pack/metricbeat/module/gcp/pubsub/_meta/docs.asciidoc[] This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. ==== Fields For a description of each field in the metricset, see the -<> section. +<> section. Here is an example document generated by this metricset: [source,json] ---- -include::../../../../x-pack/metricbeat/module/googlecloud/pubsub/_meta/data.json[] +include::../../../../x-pack/metricbeat/module/gcp/pubsub/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules/googlecloud/storage.asciidoc b/metricbeat/docs/modules/gcp/storage.asciidoc similarity index 51% rename from metricbeat/docs/modules/googlecloud/storage.asciidoc rename to metricbeat/docs/modules/gcp/storage.asciidoc index 2606dff2fff..04e7eed6d58 100644 --- a/metricbeat/docs/modules/googlecloud/storage.asciidoc +++ b/metricbeat/docs/modules/gcp/storage.asciidoc @@ -2,23 +2,23 @@ This file is generated! See scripts/mage/docs_collector.go //// -[[metricbeat-metricset-googlecloud-storage]] +[[metricbeat-metricset-gcp-storage]] [role="xpack"] === Google Cloud Platform storage metricset beta[] -include::../../../../x-pack/metricbeat/module/googlecloud/storage/_meta/docs.asciidoc[] +include::../../../../x-pack/metricbeat/module/gcp/storage/_meta/docs.asciidoc[] ==== Fields For a description of each field in the metricset, see the -<> section. +<> section. Here is an example document generated by this metricset: [source,json] ---- -include::../../../../x-pack/metricbeat/module/googlecloud/storage/_meta/data.json[] +include::../../../../x-pack/metricbeat/module/gcp/storage/_meta/data.json[] ---- diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 530958eb8f3..777a317471b 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -108,16 +108,16 @@ This file is generated! See scripts/mage/docs_collector.go |<> beta[] |<> |<> +|<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | +.6+| .6+| |<> beta[] +|<> beta[] +|<> beta[] +|<> beta[] +|<> beta[] +|<> beta[] |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .2+| .2+| |<> |<> -|<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.6+| .6+| |<> beta[] -|<> beta[] -|<> beta[] -|<> beta[] -|<> beta[] -|<> beta[] |<> |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | @@ -310,8 +310,8 @@ include::modules/dropwizard.asciidoc[] include::modules/elasticsearch.asciidoc[] include::modules/envoyproxy.asciidoc[] include::modules/etcd.asciidoc[] +include::modules/gcp.asciidoc[] include::modules/golang.asciidoc[] -include::modules/googlecloud.asciidoc[] include::modules/graphite.asciidoc[] include::modules/haproxy.asciidoc[] include::modules/http.asciidoc[] diff --git a/x-pack/metricbeat/include/list.go b/x-pack/metricbeat/include/list.go index e27c7f9a624..f4a2c1c6cfc 100644 --- a/x-pack/metricbeat/include/list.go +++ b/x-pack/metricbeat/include/list.go @@ -29,9 +29,9 @@ import ( _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/cockroachdb" _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/coredns" _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/coredns/stats" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/billing" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/billing" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/ibmmq" _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/iis" _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/iis/application_pool" diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index ef7f167940e..f8b89885efd 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -508,20 +508,8 @@ metricbeat.modules: period: 10s hosts: ["localhost:2379"] -#-------------------------------- Golang Module -------------------------------- -- module: golang - #metricsets: - # - expvar - # - heap - period: 10s - hosts: ["localhost:6060"] - heap.path: "/debug/vars" - expvar: - namespace: "example" - path: "/debug/vars" - #------------------------ Google Cloud Platform Module ------------------------ -- module: googlecloud +- module: gcp metricsets: - compute region: "us-" @@ -530,7 +518,7 @@ metricbeat.modules: exclude_labels: false period: 1m -- module: googlecloud +- module: gcp metricsets: - pubsub - loadbalancing @@ -540,7 +528,7 @@ metricbeat.modules: exclude_labels: false period: 1m -- module: googlecloud +- module: gcp metricsets: - storage project_id: "your project id" @@ -548,7 +536,7 @@ metricbeat.modules: exclude_labels: false period: 5m -- module: googlecloud +- module: gcp metricsets: - metrics project_id: "your project id" @@ -564,7 +552,7 @@ metricbeat.modules: - "instance/cpu/utilization" - "instance/uptime" -- module: googlecloud +- module: gcp metricsets: - billing period: 24h @@ -574,6 +562,18 @@ metricbeat.modules: table_pattern: "table pattern" cost_type: "regular" +#-------------------------------- Golang Module -------------------------------- +- module: golang + #metricsets: + # - expvar + # - heap + period: 10s + hosts: ["localhost:6060"] + heap.path: "/debug/vars" + expvar: + namespace: "example" + path: "/debug/vars" + #------------------------------- Graphite Module ------------------------------- - module: graphite metricsets: ["server"] diff --git a/x-pack/metricbeat/module/googlecloud/_meta/config.yml b/x-pack/metricbeat/module/gcp/_meta/config.yml similarity index 91% rename from x-pack/metricbeat/module/googlecloud/_meta/config.yml rename to x-pack/metricbeat/module/gcp/_meta/config.yml index b6f24962b29..9cf4f8387df 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/config.yml +++ b/x-pack/metricbeat/module/gcp/_meta/config.yml @@ -1,4 +1,4 @@ -- module: googlecloud +- module: gcp metricsets: - compute region: "us-" @@ -7,7 +7,7 @@ exclude_labels: false period: 1m -- module: googlecloud +- module: gcp metricsets: - pubsub - loadbalancing @@ -17,7 +17,7 @@ exclude_labels: false period: 1m -- module: googlecloud +- module: gcp metricsets: - storage project_id: "your project id" @@ -25,7 +25,7 @@ exclude_labels: false period: 5m -- module: googlecloud +- module: gcp metricsets: - metrics project_id: "your project id" @@ -41,7 +41,7 @@ - "instance/cpu/utilization" - "instance/uptime" -- module: googlecloud +- module: gcp metricsets: - billing period: 24h diff --git a/x-pack/metricbeat/module/googlecloud/_meta/docs.asciidoc b/x-pack/metricbeat/module/gcp/_meta/docs.asciidoc similarity index 93% rename from x-pack/metricbeat/module/googlecloud/_meta/docs.asciidoc rename to x-pack/metricbeat/module/gcp/_meta/docs.asciidoc index d2e74d0122f..c38894e6dc5 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/gcp/_meta/docs.asciidoc @@ -43,7 +43,7 @@ in `elastic-observability` project. + [source,yaml] ---- -- module: googlecloud +- module: gcp metricsets: - compute zone: "us-central1-a" @@ -58,7 +58,7 @@ under `us-central1` region in `elastic-observability` project. + [source,yaml] ---- -- module: googlecloud +- module: gcp metricsets: - compute - pubsub @@ -75,7 +75,7 @@ under `us-central1` region in `elastic-observability` project. + [source,yaml] ---- -- module: googlecloud +- module: gcp metricsets: - compute - pubsub @@ -128,7 +128,7 @@ If you also want to *extract service labels* (by setting `exclude_labels` to fal If `period` value is set to 5-minute and sample period of the metric type is 60-second, then this module will collect data from this metric type once every 5 minutes with aggregation. GCP monitoring data has a up to 240 seconds latency, which means latest monitoring data will be up to 4 minutes old. Please see https://cloud.google.com/monitoring/api/v3/latency-n-retention[Latency of GCP Monitoring Metric Data] for more details. -In googlecloud module, metrics are collected based on this ingest delay, which is also obtained from ListMetricDescriptors API. +In `gcp` module, metrics are collected based on this ingest delay, which is also obtained from ListMetricDescriptors API. [float] [[gcp-api-requests]] @@ -140,7 +140,7 @@ For example, if Compute Metricset fetches 14 metrics (which is the number of met [float] == Metricsets Currently, we have `billing`, `compute`, `loadbalancing`, `pubsub`, `metrics` and -`storage` metricset in `googlecloud` module. +`storage` metricset in `gcp` module. [float] === `billing` @@ -151,7 +151,7 @@ periodically to export billing metrics for further analysis. The `billing` metricset comes with a predefined dashboard: -image::./images/metricbeat-googlecloud-billing-overview.png[] +image::./images/metricbeat-gcp-billing-overview.png[] [float] === `compute` @@ -164,7 +164,7 @@ labels and metadata and metric specific Labels. The `compute` metricset comes with a predefined dashboard: -image::./images/metricbeat-googlecloud-compute-overview.png[] +image::./images/metricbeat-gcp-compute-overview.png[] [float] === `loadbalancing` @@ -177,17 +177,17 @@ The `loadbalancing` metricset comes with two predefined dashboards: [float] ==== HTTPS For HTTPS load balancing: -image::./images/metricbeat-googlecloud-load-balancing-https-overview.png[] +image::./images/metricbeat-gcp-load-balancing-https-overview.png[] [float] ==== L3 For L3 load balancing: -image::./images/metricbeat-googlecloud-load-balancing-l3-overview.png[] +image::./images/metricbeat-gcp-load-balancing-l3-overview.png[] [float] ==== TCP/SSL/Proxy For TCP/SSL/Proxy load balancing: -image::./images/metricbeat-googlecloud-load-balancing-tcp-ssl-proxy-overview.png[] +image::./images/metricbeat-gcp-load-balancing-tcp-ssl-proxy-overview.png[] [float] === `pubsub` @@ -198,7 +198,7 @@ https://cloud.google.com/monitoring/api/metrics_gcp#gcp-pubsub[GCP PubSub Monito The `pubsub` metricset comes with a predefined dashboard: -image::./images/metricbeat-googlecloud-pubsub-overview.png[] +image::./images/metricbeat-gcp-pubsub-overview.png[] [float] === `metrics` @@ -221,4 +221,4 @@ a 10-minute ingest delay. The `storage` metricset comes with a predefined dashboard: -image::./images/metricbeat-googlecloud-storage-overview.png[] +image::./images/metricbeat-gcp-storage-overview.png[] diff --git a/x-pack/metricbeat/module/googlecloud/_meta/fields.yml b/x-pack/metricbeat/module/gcp/_meta/fields.yml similarity index 89% rename from x-pack/metricbeat/module/googlecloud/_meta/fields.yml rename to x-pack/metricbeat/module/gcp/_meta/fields.yml index 84e340de576..d13da1a17c4 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/fields.yml +++ b/x-pack/metricbeat/module/gcp/_meta/fields.yml @@ -1,16 +1,16 @@ -- key: googlecloud +- key: gcp title: 'Google Cloud Platform' release: beta description: > GCP module fields: - - name: googlecloud + - name: gcp type: group fields: - name: labels type: object description: > - Google cloud monitoring metrics labels + GCP monitoring metrics labels fields: - name: user.* type: object diff --git a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-billing-overview.json b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-billing-overview.json similarity index 68% rename from x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-billing-overview.json rename to x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-billing-overview.json index 4387e827748..2b17b9a0f65 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-billing-overview.json +++ b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-billing-overview.json @@ -116,7 +116,7 @@ } ], "timeRestore": false, - "title": "[Metricbeat Googlecloud] Billing Overview", + "title": "[Metricbeat GCP] Billing Overview", "version": 1 }, "id": "76c9e920-e890-11ea-bf8c-d13ebf358a78", @@ -174,7 +174,7 @@ } } }, - "title": "Account ID Filter [Metricbeat Googlecloud]", + "title": "Account ID Filter [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -212,7 +212,7 @@ "type": "list" }, { - "fieldName": "googlecloud.billing.invoice_month", + "fieldName": "gcp.billing.invoice_month", "id": "1598988595566", "indexPatternRefName": "control_2_index_pattern", "label": "Invoice Month", @@ -231,7 +231,7 @@ "updateFiltersOnChange": false, "useTimeFilter": false }, - "title": "Account ID Filter [Metricbeat Googlecloud]", + "title": "Account ID Filter [Metricbeat GCP]", "type": "input_control_vis" } }, @@ -266,7 +266,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"e12171da-25a4-41ea-86d3-8fd71205c263\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true aggConfigs=\"[{\\\"id\\\":\\\"6011e524-4646-410b-8d1c-06c281e8f7ed\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.invoice_month\\\",\\\"orderBy\\\":\\\"f8ab301c-f139-4573-b233-ed8a3f717e24\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":12,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"f8ab301c-f139-4573-b233-ed8a3f717e24\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"sum\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6011e524-4646-410b-8d1c-06c281e8f7ed\\\":{\\\"label\\\":\\\"Invoice Month\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.billing.invoice_month\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":12,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"f8ab301c-f139-4573-b233-ed8a3f717e24\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"customLabel\\\":true,\\\"id\\\":\\\"6011e524-4646-410b-8d1c-06c281e8f7ed\\\"},\\\"col-1-f8ab301c-f139-4573-b233-ed8a3f717e24\\\":{\\\"label\\\":\\\"Total Billing Cost\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"sum\\\",\\\"sourceField\\\":\\\"googlecloud.billing.total\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"f8ab301c-f139-4573-b233-ed8a3f717e24\\\"}}\"}\n| lens_datatable \n columns={lens_datatable_columns columnIds=\"6011e524-4646-410b-8d1c-06c281e8f7ed\" columnIds=\"f8ab301c-f139-4573-b233-ed8a3f717e24\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"e12171da-25a4-41ea-86d3-8fd71205c263\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true aggConfigs=\"[{\\\"id\\\":\\\"6011e524-4646-410b-8d1c-06c281e8f7ed\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.invoice_month\\\",\\\"orderBy\\\":\\\"f8ab301c-f139-4573-b233-ed8a3f717e24\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":12,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"f8ab301c-f139-4573-b233-ed8a3f717e24\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"sum\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6011e524-4646-410b-8d1c-06c281e8f7ed\\\":{\\\"label\\\":\\\"Invoice Month\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.billing.invoice_month\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":12,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"f8ab301c-f139-4573-b233-ed8a3f717e24\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"customLabel\\\":true,\\\"id\\\":\\\"6011e524-4646-410b-8d1c-06c281e8f7ed\\\"},\\\"col-1-f8ab301c-f139-4573-b233-ed8a3f717e24\\\":{\\\"label\\\":\\\"Total Billing Cost\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"sum\\\",\\\"sourceField\\\":\\\"gcp.billing.total\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"f8ab301c-f139-4573-b233-ed8a3f717e24\\\"}}\"}\n| lens_datatable \n columns={lens_datatable_columns columnIds=\"6011e524-4646-410b-8d1c-06c281e8f7ed\" columnIds=\"f8ab301c-f139-4573-b233-ed8a3f717e24\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -301,7 +301,7 @@ "size": 12 }, "scale": "ordinal", - "sourceField": "googlecloud.billing.invoice_month" + "sourceField": "gcp.billing.invoice_month" }, "f8ab301c-f139-4573-b233-ed8a3f717e24": { "customLabel": true, @@ -310,7 +310,7 @@ "label": "Total Billing Cost", "operationType": "sum", "scale": "ratio", - "sourceField": "googlecloud.billing.total" + "sourceField": "gcp.billing.total" } }, "indexPatternId": "metricbeat-*" @@ -335,7 +335,7 @@ ] } }, - "title": "Total Cost Table [Metricbeat Googlecloud]", + "title": "Total Cost Table [Metricbeat GCP]", "visualizationType": "lnsDatatable" }, "id": "520c6f10-ec8a-11ea-a0ed-7fe6b565d158", @@ -353,7 +353,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"4ca843af-63d7-46b9-a719-51a81eebf1f7\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true aggConfigs=\"[{\\\"id\\\":\\\"2477291e-9021-4eb2-9fce-8da1ee792c49\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.project_id\\\",\\\"orderBy\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":20,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"max\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-2477291e-9021-4eb2-9fce-8da1ee792c49\\\":{\\\"label\\\":\\\"Cost Per Project ID\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.billing.project_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":20,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"customLabel\\\":true,\\\"id\\\":\\\"2477291e-9021-4eb2-9fce-8da1ee792c49\\\"},\\\"col-1-10b91492-efef-490d-bc7a-c2074b2eae84\\\":{\\\"label\\\":\\\"Maximum of googlecloud.billing.total\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"max\\\",\\\"sourceField\\\":\\\"googlecloud.billing.total\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"id\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\"}}\"}\n| lens_pie shape=\"pie\" hideLabels=false groups=\"2477291e-9021-4eb2-9fce-8da1ee792c49\" metric=\"10b91492-efef-490d-bc7a-c2074b2eae84\" numberDisplay=\"percent\" categoryDisplay=\"default\" legendDisplay=\"default\" percentDecimals=3 nestedLegend=false", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"4ca843af-63d7-46b9-a719-51a81eebf1f7\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true aggConfigs=\"[{\\\"id\\\":\\\"2477291e-9021-4eb2-9fce-8da1ee792c49\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.project_id\\\",\\\"orderBy\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":20,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"max\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-2477291e-9021-4eb2-9fce-8da1ee792c49\\\":{\\\"label\\\":\\\"Cost Per Project ID\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.billing.project_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":20,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"customLabel\\\":true,\\\"id\\\":\\\"2477291e-9021-4eb2-9fce-8da1ee792c49\\\"},\\\"col-1-10b91492-efef-490d-bc7a-c2074b2eae84\\\":{\\\"label\\\":\\\"Maximum of gcp.billing.total\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"max\\\",\\\"sourceField\\\":\\\"gcp.billing.total\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"id\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\"}}\"}\n| lens_pie shape=\"pie\" hideLabels=false groups=\"2477291e-9021-4eb2-9fce-8da1ee792c49\" metric=\"10b91492-efef-490d-bc7a-c2074b2eae84\" numberDisplay=\"percent\" categoryDisplay=\"default\" legendDisplay=\"default\" percentDecimals=3 nestedLegend=false", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -376,10 +376,10 @@ "10b91492-efef-490d-bc7a-c2074b2eae84": { "dataType": "number", "isBucketed": false, - "label": "Maximum of googlecloud.billing.total", + "label": "Maximum of gcp.billing.total", "operationType": "max", "scale": "ratio", - "sourceField": "googlecloud.billing.total" + "sourceField": "gcp.billing.total" }, "2477291e-9021-4eb2-9fce-8da1ee792c49": { "customLabel": true, @@ -396,7 +396,7 @@ "size": 20 }, "scale": "ordinal", - "sourceField": "googlecloud.billing.project_id" + "sourceField": "gcp.billing.project_id" } }, "indexPatternId": "metricbeat-*" @@ -426,7 +426,7 @@ "shape": "pie" } }, - "title": "Cost Per Project ID [Metricbeat Googlecloud]", + "title": "Cost Per Project ID [Metricbeat GCP]", "visualizationType": "lnsPie" }, "id": "057de170-e88d-11ea-bf8c-d13ebf358a78", @@ -444,7 +444,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"4cb00ce3-c62e-46f3-90ce-b69c876b9605\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true aggConfigs=\"[{\\\"id\\\":\\\"2f66b924-5392-4e5e-93fe-5b23a87068c1\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"cardinality\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.project_id\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-2f66b924-5392-4e5e-93fe-5b23a87068c1\\\":{\\\"label\\\":\\\"\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"cardinality\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"sourceField\\\":\\\"googlecloud.billing.project_id\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"2f66b924-5392-4e5e-93fe-5b23a87068c1\\\"}}\"}\n| lens_metric_chart title=\"\" accessor=\"2f66b924-5392-4e5e-93fe-5b23a87068c1\" mode=\"full\"", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"4cb00ce3-c62e-46f3-90ce-b69c876b9605\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true aggConfigs=\"[{\\\"id\\\":\\\"2f66b924-5392-4e5e-93fe-5b23a87068c1\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"cardinality\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.project_id\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-2f66b924-5392-4e5e-93fe-5b23a87068c1\\\":{\\\"label\\\":\\\"\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"cardinality\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"sourceField\\\":\\\"gcp.billing.project_id\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"2f66b924-5392-4e5e-93fe-5b23a87068c1\\\"}}\"}\n| lens_metric_chart title=\"\" accessor=\"2f66b924-5392-4e5e-93fe-5b23a87068c1\" mode=\"full\"", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -470,7 +470,7 @@ "label": "", "operationType": "cardinality", "scale": "ratio", - "sourceField": "googlecloud.billing.project_id" + "sourceField": "gcp.billing.project_id" } }, "indexPatternId": "metricbeat-*" @@ -488,7 +488,7 @@ "layerId": "4cb00ce3-c62e-46f3-90ce-b69c876b9605" } }, - "title": "Total Number Of Projects [Metricbeat Googlecloud]", + "title": "Total Number Of Projects [Metricbeat GCP]", "visualizationType": "lnsMetric" }, "id": "dd835300-e88f-11ea-bf8c-d13ebf358a78", @@ -506,7 +506,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"4ca843af-63d7-46b9-a719-51a81eebf1f7\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true aggConfigs=\"[{\\\"id\\\":\\\"e25f49de-f161-4be8-a8fc-519188a7776c\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.project_id\\\",\\\"orderBy\\\":\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":10,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"b92edf5e-58bc-4382-9cd5-19db2c332c93\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.invoice_month\\\",\\\"orderBy\\\":\\\"_key\\\",\\\"order\\\":\\\"asc\\\",\\\"size\\\":5,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"max\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-e25f49de-f161-4be8-a8fc-519188a7776c\\\":{\\\"label\\\":\\\"Monthly Cost\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.billing.project_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":10,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"customLabel\\\":true,\\\"id\\\":\\\"e25f49de-f161-4be8-a8fc-519188a7776c\\\"},\\\"col-2-b92edf5e-58bc-4382-9cd5-19db2c332c93\\\":{\\\"label\\\":\\\"Invoice Month\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.billing.invoice_month\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":5,\\\"orderBy\\\":{\\\"type\\\":\\\"alphabetical\\\"},\\\"orderDirection\\\":\\\"asc\\\"},\\\"customLabel\\\":true,\\\"id\\\":\\\"b92edf5e-58bc-4382-9cd5-19db2c332c93\\\"},\\\"col-3-af747bf6-66e9-4760-bbd8-3dae9c97159d\\\":{\\\"label\\\":\\\"Total Billing Cost\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"max\\\",\\\"sourceField\\\":\\\"googlecloud.billing.total\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\"}}\"}\n| lens_xy_chart xTitle=\"Monthly Cost\" yTitle=\"Total Billing Cost\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"4ca843af-63d7-46b9-a719-51a81eebf1f7\" hide=false xAccessor=\"e25f49de-f161-4be8-a8fc-519188a7776c\" yScaleType=\"linear\" xScaleType=\"ordinal\" isHistogram=false splitAccessor=\"b92edf5e-58bc-4382-9cd5-19db2c332c93\" seriesType=\"bar_stacked\" accessors=\"af747bf6-66e9-4760-bbd8-3dae9c97159d\" columnToLabel=\"{\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\":\\\"Total Billing Cost\\\",\\\"b92edf5e-58bc-4382-9cd5-19db2c332c93\\\":\\\"Invoice Month\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"4ca843af-63d7-46b9-a719-51a81eebf1f7\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true aggConfigs=\"[{\\\"id\\\":\\\"e25f49de-f161-4be8-a8fc-519188a7776c\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.project_id\\\",\\\"orderBy\\\":\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":10,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"b92edf5e-58bc-4382-9cd5-19db2c332c93\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.invoice_month\\\",\\\"orderBy\\\":\\\"_key\\\",\\\"order\\\":\\\"asc\\\",\\\"size\\\":5,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"max\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-e25f49de-f161-4be8-a8fc-519188a7776c\\\":{\\\"label\\\":\\\"Monthly Cost\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.billing.project_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":10,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"customLabel\\\":true,\\\"id\\\":\\\"e25f49de-f161-4be8-a8fc-519188a7776c\\\"},\\\"col-2-b92edf5e-58bc-4382-9cd5-19db2c332c93\\\":{\\\"label\\\":\\\"Invoice Month\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.billing.invoice_month\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":5,\\\"orderBy\\\":{\\\"type\\\":\\\"alphabetical\\\"},\\\"orderDirection\\\":\\\"asc\\\"},\\\"customLabel\\\":true,\\\"id\\\":\\\"b92edf5e-58bc-4382-9cd5-19db2c332c93\\\"},\\\"col-3-af747bf6-66e9-4760-bbd8-3dae9c97159d\\\":{\\\"label\\\":\\\"Total Billing Cost\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"max\\\",\\\"sourceField\\\":\\\"gcp.billing.total\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\"}}\"}\n| lens_xy_chart xTitle=\"Monthly Cost\" yTitle=\"Total Billing Cost\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"4ca843af-63d7-46b9-a719-51a81eebf1f7\" hide=false xAccessor=\"e25f49de-f161-4be8-a8fc-519188a7776c\" yScaleType=\"linear\" xScaleType=\"ordinal\" isHistogram=false splitAccessor=\"b92edf5e-58bc-4382-9cd5-19db2c332c93\" seriesType=\"bar_stacked\" accessors=\"af747bf6-66e9-4760-bbd8-3dae9c97159d\" columnToLabel=\"{\\\"af747bf6-66e9-4760-bbd8-3dae9c97159d\\\":\\\"Total Billing Cost\\\",\\\"b92edf5e-58bc-4382-9cd5-19db2c332c93\\\":\\\"Invoice Month\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -534,7 +534,7 @@ "label": "Total Billing Cost", "operationType": "max", "scale": "ratio", - "sourceField": "googlecloud.billing.total" + "sourceField": "gcp.billing.total" }, "b92edf5e-58bc-4382-9cd5-19db2c332c93": { "customLabel": true, @@ -550,7 +550,7 @@ "size": 5 }, "scale": "ordinal", - "sourceField": "googlecloud.billing.invoice_month" + "sourceField": "gcp.billing.invoice_month" }, "e25f49de-f161-4be8-a8fc-519188a7776c": { "customLabel": true, @@ -567,7 +567,7 @@ "size": 10 }, "scale": "ordinal", - "sourceField": "googlecloud.billing.project_id" + "sourceField": "gcp.billing.project_id" } }, "indexPatternId": "metricbeat-*" @@ -600,7 +600,7 @@ "preferredSeriesType": "bar_stacked" } }, - "title": "Monthly Cost Per Project [Metricbeat Googlecloud]", + "title": "Monthly Cost Per Project [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "e6933020-e88d-11ea-bf8c-d13ebf358a78", @@ -618,7 +618,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"4ca843af-63d7-46b9-a719-51a81eebf1f7\"\n layerIds=\"325e60ce-0fbd-42b0-82f6-b10df31fef6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"1164563d-d2b3-4067-bc7b-d694179182ed\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1d\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"sum\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-1164563d-d2b3-4067-bc7b-d694179182ed\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"1d\\\"},\\\"id\\\":\\\"1164563d-d2b3-4067-bc7b-d694179182ed\\\"},\\\"col-1-10b91492-efef-490d-bc7a-c2074b2eae84\\\":{\\\"label\\\":\\\"Total Billing Cost\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"sum\\\",\\\"sourceField\\\":\\\"googlecloud.billing.total\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\"}}\"}\n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"faaaaf23-f362-4a00-be9e-8a155208a39e\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.project_id\\\",\\\"orderBy\\\":\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":10,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"c4bc659c-3e7c-41f2-bc38-32d9edee95e8\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1d\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"max\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-faaaaf23-f362-4a00-be9e-8a155208a39e\\\":{\\\"sourceField\\\":\\\"googlecloud.billing.project_id\\\",\\\"isBucketed\\\":true,\\\"dataType\\\":\\\"string\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"operationType\\\":\\\"terms\\\",\\\"label\\\":\\\"Project ID\\\",\\\"customLabel\\\":true,\\\"params\\\":{\\\"size\\\":10,\\\"orderBy\\\":{\\\"columnId\\\":\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\",\\\"type\\\":\\\"column\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"faaaaf23-f362-4a00-be9e-8a155208a39e\\\"},\\\"col-2-c4bc659c-3e7c-41f2-bc38-32d9edee95e8\\\":{\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"dataType\\\":\\\"date\\\",\\\"scale\\\":\\\"interval\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"label\\\":\\\"@timestamp\\\",\\\"params\\\":{\\\"interval\\\":\\\"1d\\\"},\\\"id\\\":\\\"c4bc659c-3e7c-41f2-bc38-32d9edee95e8\\\"},\\\"col-3-3041fc1b-ceb8-4188-b55d-d354819f267e\\\":{\\\"sourceField\\\":\\\"googlecloud.billing.total\\\",\\\"isBucketed\\\":false,\\\"dataType\\\":\\\"number\\\",\\\"scale\\\":\\\"ratio\\\",\\\"operationType\\\":\\\"max\\\",\\\"label\\\":\\\"Total Billing\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp [1]\" yTitle=\"Total Billing\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"325e60ce-0fbd-42b0-82f6-b10df31fef6c\" hide=false xAccessor=\"c4bc659c-3e7c-41f2-bc38-32d9edee95e8\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"faaaaf23-f362-4a00-be9e-8a155208a39e\" seriesType=\"bar_stacked\" accessors=\"3041fc1b-ceb8-4188-b55d-d354819f267e\" columnToLabel=\"{\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\":\\\"Total Billing\\\",\\\"faaaaf23-f362-4a00-be9e-8a155208a39e\\\":\\\"Project ID\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"4ca843af-63d7-46b9-a719-51a81eebf1f7\"\n layerIds=\"325e60ce-0fbd-42b0-82f6-b10df31fef6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"1164563d-d2b3-4067-bc7b-d694179182ed\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1d\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"sum\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-1164563d-d2b3-4067-bc7b-d694179182ed\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"1d\\\"},\\\"id\\\":\\\"1164563d-d2b3-4067-bc7b-d694179182ed\\\"},\\\"col-1-10b91492-efef-490d-bc7a-c2074b2eae84\\\":{\\\"label\\\":\\\"Total Billing Cost\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"sum\\\",\\\"sourceField\\\":\\\"gcp.billing.total\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"10b91492-efef-490d-bc7a-c2074b2eae84\\\"}}\"}\n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"faaaaf23-f362-4a00-be9e-8a155208a39e\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.project_id\\\",\\\"orderBy\\\":\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":10,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"c4bc659c-3e7c-41f2-bc38-32d9edee95e8\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1d\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"max\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.billing.total\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-faaaaf23-f362-4a00-be9e-8a155208a39e\\\":{\\\"sourceField\\\":\\\"gcp.billing.project_id\\\",\\\"isBucketed\\\":true,\\\"dataType\\\":\\\"string\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"operationType\\\":\\\"terms\\\",\\\"label\\\":\\\"Project ID\\\",\\\"customLabel\\\":true,\\\"params\\\":{\\\"size\\\":10,\\\"orderBy\\\":{\\\"columnId\\\":\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\",\\\"type\\\":\\\"column\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"faaaaf23-f362-4a00-be9e-8a155208a39e\\\"},\\\"col-2-c4bc659c-3e7c-41f2-bc38-32d9edee95e8\\\":{\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"dataType\\\":\\\"date\\\",\\\"scale\\\":\\\"interval\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"label\\\":\\\"@timestamp\\\",\\\"params\\\":{\\\"interval\\\":\\\"1d\\\"},\\\"id\\\":\\\"c4bc659c-3e7c-41f2-bc38-32d9edee95e8\\\"},\\\"col-3-3041fc1b-ceb8-4188-b55d-d354819f267e\\\":{\\\"sourceField\\\":\\\"gcp.billing.total\\\",\\\"isBucketed\\\":false,\\\"dataType\\\":\\\"number\\\",\\\"scale\\\":\\\"ratio\\\",\\\"operationType\\\":\\\"max\\\",\\\"label\\\":\\\"Total Billing\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp [1]\" yTitle=\"Total Billing\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"325e60ce-0fbd-42b0-82f6-b10df31fef6c\" hide=false xAccessor=\"c4bc659c-3e7c-41f2-bc38-32d9edee95e8\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"faaaaf23-f362-4a00-be9e-8a155208a39e\" seriesType=\"bar_stacked\" accessors=\"3041fc1b-ceb8-4188-b55d-d354819f267e\" columnToLabel=\"{\\\"3041fc1b-ceb8-4188-b55d-d354819f267e\\\":\\\"Total Billing\\\",\\\"faaaaf23-f362-4a00-be9e-8a155208a39e\\\":\\\"Project ID\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -646,7 +646,7 @@ "label": "Total Billing", "operationType": "max", "scale": "ratio", - "sourceField": "googlecloud.billing.total" + "sourceField": "gcp.billing.total" }, "c4bc659c-3e7c-41f2-bc38-32d9edee95e8": { "dataType": "date", @@ -674,7 +674,7 @@ "size": 10 }, "scale": "ordinal", - "sourceField": "googlecloud.billing.project_id" + "sourceField": "gcp.billing.project_id" } }, "indexPatternId": "metricbeat-*" @@ -692,7 +692,7 @@ "label": "Total Billing Cost", "operationType": "sum", "scale": "ratio", - "sourceField": "googlecloud.billing.total" + "sourceField": "gcp.billing.total" }, "1164563d-d2b3-4067-bc7b-d694179182ed": { "dataType": "date", @@ -720,7 +720,7 @@ "size": 15 }, "scale": "ordinal", - "sourceField": "googlecloud.billing.project_id" + "sourceField": "gcp.billing.project_id" } }, "indexPatternId": "metricbeat-*" @@ -753,7 +753,7 @@ "preferredSeriesType": "bar_stacked" } }, - "title": "Total Cost Bar Chart [Metricbeat Googlecloud]", + "title": "Total Cost Bar Chart [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "73346db0-e88d-11ea-bf8c-d13ebf358a78", diff --git a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-compute-overview.json b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-compute-overview.json similarity index 93% rename from x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-compute-overview.json rename to x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-compute-overview.json index 185905f94ae..c7fd124ddbb 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-compute-overview.json +++ b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-compute-overview.json @@ -2,7 +2,7 @@ "objects": [ { "attributes": { - "description": "Overview of Googlecloud Compute Metrics", + "description": "Overview of GCP Compute Metrics", "hits": 0, "kibanaSavedObjectMeta": { "searchSourceJSON": { @@ -164,7 +164,7 @@ } ], "timeRestore": false, - "title": "[Metricbeat Googlecloud] Compute Overview", + "title": "[Metricbeat GCP] Compute Overview", "version": 1 }, "id": "f40ee870-5e4a-11ea-a4f6-717338406083", @@ -237,7 +237,7 @@ } } }, - "title": "az-instance-account Filter [Metricbeat Googlecloud]", + "title": "az-instance-account Filter [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -294,7 +294,7 @@ "updateFiltersOnChange": true, "useTimeFilter": false }, - "title": "az-instance-account Filter [Metricbeat Googlecloud]", + "title": "az-instance-account Filter [Metricbeat GCP]", "type": "input_control_vis" } }, @@ -338,7 +338,7 @@ } } }, - "title": "Compute Instance Uptime Gauge [Metricbeat Googlecloud]", + "title": "Compute Instance Uptime Gauge [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -395,9 +395,9 @@ "metrics": [ { "denominator": "60", - "field": "googlecloud.compute.instance.uptime.value", + "field": "gcp.compute.instance.uptime.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", - "numerator": "googlecloud.compute.instance.uptime.value", + "numerator": "gcp.compute.instance.uptime.value", "type": "avg", "values": [ "60" @@ -434,7 +434,7 @@ "tooltip_mode": "show_all", "type": "gauge" }, - "title": "Compute Instance Uptime Gauge [Metricbeat Googlecloud]", + "title": "Compute Instance Uptime Gauge [Metricbeat GCP]", "type": "metrics" } }, @@ -456,7 +456,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Compute CPU Utilization [Metricbeat Googlecloud]", + "title": "Compute CPU Utilization [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -484,7 +484,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.compute.instance.cpu.utilization.value", + "field": "gcp.compute.instance.cpu.utilization.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -504,7 +504,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Compute CPU Utilization [Metricbeat Googlecloud]", + "title": "Compute CPU Utilization [Metricbeat GCP]", "type": "metrics" } }, @@ -526,7 +526,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Compute Read I/O [Metricbeat Googlecloud]", + "title": "Compute Read I/O [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -554,7 +554,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.compute.instance.disk.read_ops_count.value", + "field": "gcp.compute.instance.disk.read_ops_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -573,7 +573,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Compute Read I/O [Metricbeat Googlecloud]", + "title": "Compute Read I/O [Metricbeat GCP]", "type": "metrics" } }, @@ -595,7 +595,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Compute Write I/O [Metricbeat Googlecloud]", + "title": "Compute Write I/O [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -623,7 +623,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.compute.instance.disk.write_ops_count.value", + "field": "gcp.compute.instance.disk.write_ops_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -642,7 +642,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Compute Write I/O [Metricbeat Googlecloud]", + "title": "Compute Write I/O [Metricbeat GCP]", "type": "metrics" } }, @@ -664,7 +664,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Compute Network Sent Bytes [Metricbeat Googlecloud]", + "title": "Compute Network Sent Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -692,7 +692,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.compute.instance.network.sent_bytes_count.value", + "field": "gcp.compute.instance.network.sent_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -711,7 +711,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Compute Network Sent Bytes [Metricbeat Googlecloud]", + "title": "Compute Network Sent Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -733,7 +733,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Compute Network Received Bytes [Metricbeat Googlecloud]", + "title": "Compute Network Received Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -761,7 +761,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.compute.instance.network.received_bytes_count.value", + "field": "gcp.compute.instance.network.received_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -780,7 +780,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Compute Network Received Bytes [Metricbeat Googlecloud]", + "title": "Compute Network Received Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -802,7 +802,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Compute Firewall Dropped Bytes [Metricbeat Googlecloud]", + "title": "Compute Firewall Dropped Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -848,7 +848,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.compute.firewall.dropped_bytes_count.value", + "field": "gcp.compute.firewall.dropped_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -868,7 +868,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Compute Firewall Dropped Bytes [Metricbeat Googlecloud]", + "title": "Compute Firewall Dropped Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -890,7 +890,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Compute Firewall Dropped Packets [Metricbeat Googlecloud]", + "title": "Compute Firewall Dropped Packets [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -936,7 +936,7 @@ "line_width": "3", "metrics": [ { - "field": "googlecloud.compute.firewall.dropped_packets_count.value", + "field": "gcp.compute.firewall.dropped_packets_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -957,7 +957,7 @@ "time_range_mode": "entire_time_range", "type": "top_n" }, - "title": "Compute Firewall Dropped Packets [Metricbeat Googlecloud]", + "title": "Compute Firewall Dropped Packets [Metricbeat GCP]", "type": "metrics" } }, diff --git a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-load-balancing-https-overview.json b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-load-balancing-https-overview.json similarity index 89% rename from x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-load-balancing-https-overview.json rename to x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-load-balancing-https-overview.json index 5cf509b82d4..1b7e007a2ea 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-load-balancing-https-overview.json +++ b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-load-balancing-https-overview.json @@ -2,7 +2,7 @@ "objects": [ { "attributes": { - "description": "Overview of Googlecloud Load Balancing HTTPS Metrics", + "description": "Overview of GCP Load Balancing HTTPS Metrics", "hits": 0, "kibanaSavedObjectMeta": { "searchSourceJSON": { @@ -132,7 +132,7 @@ } ], "timeRestore": false, - "title": "[Metricbeat Googlecloud] Load Balancing HTTPS Overview", + "title": "[Metricbeat GCP] Load Balancing HTTPS Overview", "version": 1 }, "id": "aa5b8bd0-9157-11ea-8180-7b0dacd9df87", @@ -186,7 +186,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing HTTPS Filters [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Filters [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -194,7 +194,7 @@ "params": { "controls": [ { - "fieldName": "googlecloud.labels.resource.url_map_name", + "fieldName": "gcp.labels.resource.url_map_name", "id": "1588961027791", "indexPatternRefName": "control_0_index_pattern", "label": "URL Map Name", @@ -209,7 +209,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.resource.region", + "fieldName": "gcp.labels.resource.region", "id": "1588961077426", "indexPatternRefName": "control_1_index_pattern", "label": "Region", @@ -224,7 +224,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.metrics.client_country", + "fieldName": "gcp.labels.metrics.client_country", "id": "1588961157559", "indexPatternRefName": "control_2_index_pattern", "label": "Client Country", @@ -243,7 +243,7 @@ "updateFiltersOnChange": false, "useTimeFilter": false }, - "title": "Load Balancing HTTPS Filters [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Filters [Metricbeat GCP]", "type": "input_control_vis" } }, @@ -278,7 +278,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing HTTPS Backend Request Count [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Backend Request Count [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -301,7 +301,7 @@ "fill": "0", "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.https.backend_request_count.value : * " + "query": "gcp.loadbalancing.https.backend_request_count.value : * " }, "formatter": "number", "id": "61ca57f1-469d-11e7-af02-69e470af7417", @@ -309,7 +309,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.https.backend_request_count.value", + "field": "gcp.loadbalancing.https.backend_request_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -318,7 +318,7 @@ "separate_axis": 0, "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.url_map_name", + "terms_field": "gcp.labels.resource.url_map_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -328,7 +328,7 @@ "time_field": null, "type": "timeseries" }, - "title": "Load Balancing HTTPS Backend Request Count [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Backend Request Count [Metricbeat GCP]", "type": "metrics" } }, @@ -347,7 +347,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing HTTPS Request Count [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Request Count [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -360,7 +360,7 @@ "default_timefield": "@timestamp", "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.https.request_count.value : * " + "query": "gcp.loadbalancing.https.request_count.value : * " }, "id": "61ca57f0-469d-11e7-af02-69e470af7417", "index_pattern": "metricbeat-*", @@ -374,7 +374,7 @@ "fill": "0", "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.https.request_count.value : * " + "query": "gcp.loadbalancing.https.request_count.value : * " }, "formatter": "number", "id": "61ca57f1-469d-11e7-af02-69e470af7417", @@ -382,7 +382,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.https.request_count.value", + "field": "gcp.loadbalancing.https.request_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -391,7 +391,7 @@ "separate_axis": 0, "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.url_map_name", + "terms_field": "gcp.labels.resource.url_map_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -401,7 +401,7 @@ "time_field": null, "type": "timeseries" }, - "title": "Load Balancing HTTPS Request Count [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Request Count [Metricbeat GCP]", "type": "metrics" } }, @@ -420,7 +420,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing HTTPS Backend Request Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Backend Request Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -443,7 +443,7 @@ "fill": "0", "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.https.backend_request_bytes_count.value : * " + "query": "gcp.loadbalancing.https.backend_request_bytes_count.value : * " }, "formatter": "bytes", "id": "61ca57f1-469d-11e7-af02-69e470af7417", @@ -451,7 +451,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.https.backend_request_bytes_count.value", + "field": "gcp.loadbalancing.https.backend_request_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -460,7 +460,7 @@ "separate_axis": 0, "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.url_map_name", + "terms_field": "gcp.labels.resource.url_map_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -470,7 +470,7 @@ "time_field": null, "type": "timeseries" }, - "title": "Load Balancing HTTPS Backend Request Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Backend Request Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -489,7 +489,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing HTTPS Request Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Request Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -502,7 +502,7 @@ "default_timefield": "@timestamp", "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.https.request_bytes_count.value : * " + "query": "gcp.loadbalancing.https.request_bytes_count.value : * " }, "id": "61ca57f0-469d-11e7-af02-69e470af7417", "index_pattern": "metricbeat-*", @@ -520,7 +520,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.https.request_bytes_count.value", + "field": "gcp.loadbalancing.https.request_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -529,7 +529,7 @@ "separate_axis": 0, "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.url_map_name", + "terms_field": "gcp.labels.resource.url_map_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -539,7 +539,7 @@ "time_field": null, "type": "timeseries" }, - "title": "Load Balancing HTTPS Request Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Request Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -558,7 +558,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing HTTPS Backend Response Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Backend Response Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -571,7 +571,7 @@ "default_timefield": "@timestamp", "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.https.backend_response_bytes_count.value : * " + "query": "gcp.loadbalancing.https.backend_response_bytes_count.value : * " }, "id": "61ca57f0-469d-11e7-af02-69e470af7417", "index_pattern": "metricbeat-*", @@ -589,7 +589,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.https.backend_response_bytes_count.value", + "field": "gcp.loadbalancing.https.backend_response_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -598,7 +598,7 @@ "separate_axis": 0, "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.url_map_name", + "terms_field": "gcp.labels.resource.url_map_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -608,7 +608,7 @@ "time_field": null, "type": "timeseries" }, - "title": "Load Balancing HTTPS Backend Response Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Backend Response Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -627,7 +627,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing HTTPS Response Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Response Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -640,7 +640,7 @@ "default_timefield": "@timestamp", "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.https.response_bytes_count.value : * " + "query": "gcp.loadbalancing.https.response_bytes_count.value : * " }, "id": "61ca57f0-469d-11e7-af02-69e470af7417", "index_pattern": "metricbeat-*", @@ -654,7 +654,7 @@ "fill": "0", "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.https.response_bytes_count.value : * " + "query": "gcp.loadbalancing.https.response_bytes_count.value : * " }, "formatter": "bytes", "id": "61ca57f1-469d-11e7-af02-69e470af7417", @@ -662,7 +662,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.https.response_bytes_count.value", + "field": "gcp.loadbalancing.https.response_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -671,7 +671,7 @@ "separate_axis": 0, "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.url_map_name", + "terms_field": "gcp.labels.resource.url_map_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -681,7 +681,7 @@ "time_field": null, "type": "timeseries" }, - "title": "Load Balancing HTTPS Response Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing HTTPS Response Bytes [Metricbeat GCP]", "type": "metrics" } }, diff --git a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-loadbalancing-l3-overview.json b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-l3-overview.json similarity index 89% rename from x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-loadbalancing-l3-overview.json rename to x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-l3-overview.json index 3f2109b6322..629be2ae16f 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-loadbalancing-l3-overview.json +++ b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-l3-overview.json @@ -2,7 +2,7 @@ "objects": [ { "attributes": { - "description": "Overview of Googlecloud Load Balancing L3 Metrics", + "description": "Overview of GCP Load Balancing L3 Metrics", "hits": 0, "kibanaSavedObjectMeta": { "searchSourceJSON": { @@ -100,7 +100,7 @@ } ], "timeRestore": false, - "title": "[Metricbeat Googlecloud] Load Balancing L3 Overview", + "title": "[Metricbeat GCP] Load Balancing L3 Overview", "version": 1 }, "id": "8f9c6cc0-909d-11ea-8180-7b0dacd9df87", @@ -144,7 +144,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing L3 Filters [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Filters [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -152,7 +152,7 @@ "params": { "controls": [ { - "fieldName": "googlecloud.labels.resource.backend_name", + "fieldName": "gcp.labels.resource.backend_name", "id": "1588881306802", "indexPatternRefName": "control_0_index_pattern", "label": "Backend Name", @@ -167,7 +167,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.metrics.client_zone", + "fieldName": "gcp.labels.metrics.client_zone", "id": "1588881320708", "indexPatternRefName": "control_1_index_pattern", "label": "Client Zone", @@ -182,7 +182,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.metrics.client_network", + "fieldName": "gcp.labels.metrics.client_network", "id": "1588881383318", "indexPatternRefName": "control_2_index_pattern", "label": "Client Network", @@ -197,7 +197,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.metrics.client_subnetwork", + "fieldName": "gcp.labels.metrics.client_subnetwork", "id": "1588881498842", "indexPatternRefName": "control_3_index_pattern", "label": "Client Sub-network", @@ -216,7 +216,7 @@ "updateFiltersOnChange": false, "useTimeFilter": false }, - "title": "Load Balancing L3 Filters [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Filters [Metricbeat GCP]", "type": "input_control_vis" } }, @@ -256,7 +256,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing L3 Egress Packets [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Egress Packets [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -270,7 +270,7 @@ "drop_last_bucket": 1, "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.l3.internal.egress_packets_count.value : * " + "query": "gcp.loadbalancing.l3.internal.egress_packets_count.value : * " }, "id": "61ca57f0-469d-11e7-af02-69e470af7417", "index_pattern": "metricbeat-*", @@ -288,7 +288,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.l3.internal.egress_packets_count.value", + "field": "gcp.loadbalancing.l3.internal.egress_packets_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -298,7 +298,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -308,7 +308,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Load Balancing L3 Egress Packets [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Egress Packets [Metricbeat GCP]", "type": "metrics" } }, @@ -327,7 +327,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing L3 Egress Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Egress Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -341,7 +341,7 @@ "drop_last_bucket": 1, "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.l3.internal.egress_bytes_count.value : * " + "query": "gcp.loadbalancing.l3.internal.egress_bytes_count.value : * " }, "id": "61ca57f0-469d-11e7-af02-69e470af7417", "index_pattern": "metricbeat-*", @@ -359,7 +359,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.l3.internal.egress_bytes_count.value", + "field": "gcp.loadbalancing.l3.internal.egress_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -369,7 +369,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -379,7 +379,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Load Balancing L3 Egress Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Egress Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -398,7 +398,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing L3 Ingress Packets [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Ingress Packets [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -412,7 +412,7 @@ "drop_last_bucket": 1, "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.l3.internal.ingress_packets_count.value : * " + "query": "gcp.loadbalancing.l3.internal.ingress_packets_count.value : * " }, "id": "61ca57f0-469d-11e7-af02-69e470af7417", "index_pattern": "metricbeat-*", @@ -430,7 +430,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.l3.internal.ingress_packets_count.value", + "field": "gcp.loadbalancing.l3.internal.ingress_packets_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -440,7 +440,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -450,7 +450,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Load Balancing L3 Ingress Packets [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Ingress Packets [Metricbeat GCP]", "type": "metrics" } }, @@ -469,7 +469,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Load Balancing L3 Ingress Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Ingress Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -483,7 +483,7 @@ "drop_last_bucket": 1, "filter": { "language": "kuery", - "query": "googlecloud.loadbalancing.l3.internal.ingress_bytes_count.value : * " + "query": "gcp.loadbalancing.l3.internal.ingress_bytes_count.value : * " }, "id": "61ca57f0-469d-11e7-af02-69e470af7417", "index_pattern": "metricbeat-*", @@ -501,7 +501,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.l3.internal.ingress_bytes_count.value", + "field": "gcp.loadbalancing.l3.internal.ingress_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -511,7 +511,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -521,7 +521,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Load Balancing L3 Ingress Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing L3 Ingress Bytes [Metricbeat GCP]", "type": "metrics" } }, diff --git a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-loadbalancing-tcp-ssl-proxy-overview.json b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-tcp-ssl-proxy-overview.json similarity index 93% rename from x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-loadbalancing-tcp-ssl-proxy-overview.json rename to x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-tcp-ssl-proxy-overview.json index b64f87f6ade..178cf1de4d9 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-loadbalancing-tcp-ssl-proxy-overview.json +++ b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-loadbalancing-tcp-ssl-proxy-overview.json @@ -116,7 +116,7 @@ } ], "timeRestore": false, - "title": "[Metricbeat Googlecloud] Load Balancing TCP SSL Proxy Overview", + "title": "[Metricbeat GCP] Load Balancing TCP SSL Proxy Overview", "version": 1 }, "id": "6041d970-a6ae-11ea-950e-d57608e3aa51", @@ -171,7 +171,7 @@ } } }, - "title": "Load Balancing TCP SSL Proxy Filters [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Filters [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -179,7 +179,7 @@ "params": { "controls": [ { - "fieldName": "googlecloud.labels.resource.backend_name", + "fieldName": "gcp.labels.resource.backend_name", "id": "1588881306802", "indexPatternRefName": "control_0_index_pattern", "label": "Backend Name", @@ -194,7 +194,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.metrics.client_country", + "fieldName": "gcp.labels.metrics.client_country", "id": "1588881320708", "indexPatternRefName": "control_1_index_pattern", "label": "Client Country", @@ -209,7 +209,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.metrics.proxy_continent", + "fieldName": "gcp.labels.metrics.proxy_continent", "id": "1588881383318", "indexPatternRefName": "control_2_index_pattern", "label": "Proxy Continent", @@ -228,7 +228,7 @@ "updateFiltersOnChange": false, "useTimeFilter": false }, - "title": "Load Balancing TCP SSL Proxy Filters [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Filters [Metricbeat GCP]", "type": "input_control_vis" } }, @@ -269,7 +269,7 @@ } } }, - "title": "Load Balancing TCP SSL Proxy Open Connections [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Open Connections [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -306,7 +306,7 @@ "line_width": 1, "metrics": [ { - "field": "googlecloud.loadbalancing.tcp_ssl_proxy.open_connections.value", + "field": "gcp.loadbalancing.tcp_ssl_proxy.open_connections.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -316,7 +316,7 @@ "split_color_mode": "kibana", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -326,7 +326,7 @@ "time_field": "", "type": "top_n" }, - "title": "Load Balancing TCP SSL Proxy Open Connections [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Open Connections [Metricbeat GCP]", "type": "metrics" } }, @@ -351,7 +351,7 @@ } } }, - "title": "Load Balancing TCP SSL Proxy Closed Connections [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Closed Connections [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -388,7 +388,7 @@ "line_width": 1, "metrics": [ { - "field": "googlecloud.loadbalancing.tcp_ssl_proxy.closed_connections.value", + "field": "gcp.loadbalancing.tcp_ssl_proxy.closed_connections.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -398,7 +398,7 @@ "split_color_mode": "kibana", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -408,7 +408,7 @@ "time_field": "", "type": "top_n" }, - "title": "Load Balancing TCP SSL Proxy Closed Connections [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Closed Connections [Metricbeat GCP]", "type": "metrics" } }, @@ -433,7 +433,7 @@ } } }, - "title": "Load Balancing TCP SSL Proxy New Connections [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy New Connections [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -470,7 +470,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.tcp_ssl_proxy.new_connections.value", + "field": "gcp.loadbalancing.tcp_ssl_proxy.new_connections.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -480,7 +480,7 @@ "split_color_mode": "kibana", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -490,7 +490,7 @@ "time_field": "", "type": "top_n" }, - "title": "Load Balancing TCP SSL Proxy New Connections [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy New Connections [Metricbeat GCP]", "type": "metrics" } }, @@ -515,7 +515,7 @@ } } }, - "title": "Load Balancing TCP SSL Proxy Egress Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Egress Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -552,7 +552,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.tcp_ssl_proxy.egress_bytes_count.value", + "field": "gcp.loadbalancing.tcp_ssl_proxy.egress_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -562,7 +562,7 @@ "split_color_mode": "kibana", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -572,7 +572,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Load Balancing TCP SSL Proxy Egress Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Egress Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -597,7 +597,7 @@ } } }, - "title": "Load Balancing TCP SSL Proxy Ingress Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Ingress Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -634,7 +634,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.loadbalancing.tcp_ssl_proxy.ingress_bytes_count.value", + "field": "gcp.loadbalancing.tcp_ssl_proxy.ingress_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -644,7 +644,7 @@ "split_color_mode": "kibana", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.backend_name", + "terms_field": "gcp.labels.resource.backend_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -654,7 +654,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Load Balancing TCP SSL Proxy Ingress Bytes [Metricbeat Googlecloud]", + "title": "Load Balancing TCP SSL Proxy Ingress Bytes [Metricbeat GCP]", "type": "metrics" } }, diff --git a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-pubsub-overview.json b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-pubsub-overview.json similarity index 66% rename from x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-pubsub-overview.json rename to x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-pubsub-overview.json index 6b937817527..89c5ef41109 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-pubsub-overview.json +++ b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-pubsub-overview.json @@ -2,7 +2,7 @@ "objects": [ { "attributes": { - "description": "Overview of Googlecloud PubSub Metrics", + "description": "Overview of GCP PubSub Metrics", "hits": 0, "kibanaSavedObjectMeta": { "searchSourceJSON": { @@ -180,7 +180,7 @@ } ], "timeRestore": false, - "title": "[Metricbeat Googlecloud] PubSub Overview", + "title": "[Metricbeat GCP] PubSub Overview", "version": 1 }, "id": "2b0fd7b0-feac-11ea-b032-d59f894a5072", @@ -258,7 +258,7 @@ } } }, - "title": "PubSub Filter [Metricbeat Googlecloud]", + "title": "PubSub Filter [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -266,7 +266,7 @@ "params": { "controls": [ { - "fieldName": "googlecloud.labels.resource.subscription_id", + "fieldName": "gcp.labels.resource.subscription_id", "id": "1600984143264", "indexPatternRefName": "control_0_index_pattern", "label": "Subscription ID", @@ -281,7 +281,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.resource.topic_id", + "fieldName": "gcp.labels.resource.topic_id", "id": "1600984164459", "indexPatternRefName": "control_1_index_pattern", "label": "Topic ID", @@ -296,7 +296,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.resource.snapshot_id", + "fieldName": "gcp.labels.resource.snapshot_id", "id": "1601305675297", "indexPatternRefName": "control_2_index_pattern", "label": "Snapshot ID", @@ -311,7 +311,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.metrics.region", + "fieldName": "gcp.labels.metrics.region", "id": "1601307561260", "indexPatternRefName": "control_3_index_pattern", "label": "Region", @@ -330,7 +330,7 @@ "updateFiltersOnChange": false, "useTimeFilter": false }, - "title": "PubSub Filter [Metricbeat Googlecloud]", + "title": "PubSub Filter [Metricbeat GCP]", "type": "input_control_vis" } }, @@ -370,7 +370,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"4f8dae5f-b49c-4a10-8f94-a29039f93919\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.resource.topic_id\\\",\\\"orderBy\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.topic.send_request_count.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-4f8dae5f-b49c-4a10-8f94-a29039f93919\\\":{\\\"label\\\":\\\"Top values of googlecloud.labels.resource.topic_id\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.resource.topic_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"4f8dae5f-b49c-4a10-8f94-a29039f93919\\\"},\\\"col-2-f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"id\\\":\\\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\"},\\\"col-3-27a71166-d245-471d-b550-ee0b1899ea88\\\":{\\\"label\\\":\\\"Topic Send Request Count\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"googlecloud.pubsub.topic.send_request_count.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Topic Send Request Count\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"4f8dae5f-b49c-4a10-8f94-a29039f93919\" seriesType=\"line\" accessors=\"27a71166-d245-471d-b550-ee0b1899ea88\" columnToLabel=\"{\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\":\\\"Topic Send Request Count\\\",\\\"4f8dae5f-b49c-4a10-8f94-a29039f93919\\\":\\\"Top values of googlecloud.labels.resource.topic_id\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"4f8dae5f-b49c-4a10-8f94-a29039f93919\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.resource.topic_id\\\",\\\"orderBy\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.topic.send_request_count.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-4f8dae5f-b49c-4a10-8f94-a29039f93919\\\":{\\\"label\\\":\\\"Top values of gcp.labels.resource.topic_id\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.resource.topic_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"4f8dae5f-b49c-4a10-8f94-a29039f93919\\\"},\\\"col-2-f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"id\\\":\\\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\"},\\\"col-3-27a71166-d245-471d-b550-ee0b1899ea88\\\":{\\\"label\\\":\\\"Topic Send Request Count\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"gcp.pubsub.topic.send_request_count.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Topic Send Request Count\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"4f8dae5f-b49c-4a10-8f94-a29039f93919\" seriesType=\"line\" accessors=\"27a71166-d245-471d-b550-ee0b1899ea88\" columnToLabel=\"{\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\":\\\"Topic Send Request Count\\\",\\\"4f8dae5f-b49c-4a10-8f94-a29039f93919\\\":\\\"Top values of gcp.labels.resource.topic_id\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -398,13 +398,13 @@ "label": "Topic Send Request Count", "operationType": "avg", "scale": "ratio", - "sourceField": "googlecloud.pubsub.topic.send_request_count.value", + "sourceField": "gcp.pubsub.topic.send_request_count.value", "suggestedPriority": 0 }, "4f8dae5f-b49c-4a10-8f94-a29039f93919": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.resource.topic_id", + "label": "Top values of gcp.labels.resource.topic_id", "operationType": "terms", "params": { "orderBy": { @@ -415,7 +415,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.resource.topic_id" + "sourceField": "gcp.labels.resource.topic_id" }, "f0d11f8d-e2f9-408a-9114-a0b9b18142d4": { "dataType": "date", @@ -459,7 +459,7 @@ "preferredSeriesType": "line" } }, - "title": "Topic Send Request [Metricbeat Googlecloud]", + "title": "Topic Send Request [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "bd399790-01a2-11eb-b032-d59f894a5072", @@ -477,7 +477,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"89c8d41d-6896-470d-8318-c0a691fa638e\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.metrics.region\\\",\\\"orderBy\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.topic.oldest_retained_acked_message_age_by_region.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"id\\\":\\\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\"},\\\"col-2-89c8d41d-6896-470d-8318-c0a691fa638e\\\":{\\\"label\\\":\\\"Top values of googlecloud.labels.metrics.region\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.metrics.region\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"89c8d41d-6896-470d-8318-c0a691fa638e\\\"},\\\"col-3-27a71166-d245-471d-b550-ee0b1899ea88\\\":{\\\"label\\\":\\\"Topic Oldest Retained Acked Message Age By Region\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"googlecloud.pubsub.topic.oldest_retained_acked_message_age_by_region.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Topic Oldest Retained Acked Message Age By Region\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"89c8d41d-6896-470d-8318-c0a691fa638e\" seriesType=\"line\" accessors=\"27a71166-d245-471d-b550-ee0b1899ea88\" columnToLabel=\"{\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\":\\\"Topic Oldest Retained Acked Message Age By Region\\\",\\\"89c8d41d-6896-470d-8318-c0a691fa638e\\\":\\\"Top values of googlecloud.labels.metrics.region\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"89c8d41d-6896-470d-8318-c0a691fa638e\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.metrics.region\\\",\\\"orderBy\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.topic.oldest_retained_acked_message_age_by_region.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"id\\\":\\\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\\\"},\\\"col-2-89c8d41d-6896-470d-8318-c0a691fa638e\\\":{\\\"label\\\":\\\"Top values of gcp.labels.metrics.region\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.metrics.region\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"89c8d41d-6896-470d-8318-c0a691fa638e\\\"},\\\"col-3-27a71166-d245-471d-b550-ee0b1899ea88\\\":{\\\"label\\\":\\\"Topic Oldest Retained Acked Message Age By Region\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"gcp.pubsub.topic.oldest_retained_acked_message_age_by_region.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Topic Oldest Retained Acked Message Age By Region\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"f0d11f8d-e2f9-408a-9114-a0b9b18142d4\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"89c8d41d-6896-470d-8318-c0a691fa638e\" seriesType=\"line\" accessors=\"27a71166-d245-471d-b550-ee0b1899ea88\" columnToLabel=\"{\\\"27a71166-d245-471d-b550-ee0b1899ea88\\\":\\\"Topic Oldest Retained Acked Message Age By Region\\\",\\\"89c8d41d-6896-470d-8318-c0a691fa638e\\\":\\\"Top values of gcp.labels.metrics.region\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -505,13 +505,13 @@ "label": "Topic Oldest Retained Acked Message Age By Region", "operationType": "avg", "scale": "ratio", - "sourceField": "googlecloud.pubsub.topic.oldest_retained_acked_message_age_by_region.value", + "sourceField": "gcp.pubsub.topic.oldest_retained_acked_message_age_by_region.value", "suggestedPriority": 0 }, "89c8d41d-6896-470d-8318-c0a691fa638e": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.metrics.region", + "label": "Top values of gcp.labels.metrics.region", "operationType": "terms", "params": { "orderBy": { @@ -522,7 +522,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.metrics.region" + "sourceField": "gcp.labels.metrics.region" }, "f0d11f8d-e2f9-408a-9114-a0b9b18142d4": { "dataType": "date", @@ -566,7 +566,7 @@ "preferredSeriesType": "line" } }, - "title": "Topic Oldest Retained Acked Message Age By Region [Metricbeat Googlecloud]", + "title": "Topic Oldest Retained Acked Message Age By Region [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "25b76dc0-01a2-11eb-b032-d59f894a5072", @@ -584,7 +584,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"ed36f31e-ed2a-460a-a881-18e191f75d04\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.metrics.region\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.topic.oldest_unacked_message_age_by_region.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-ed36f31e-ed2a-460a-a881-18e191f75d04\\\":{\\\"label\\\":\\\"Top values of googlecloud.labels.metrics.region\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.metrics.region\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"ed36f31e-ed2a-460a-a881-18e191f75d04\\\"},\\\"col-2-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"label\\\":\\\"Topic Oldest Unacked Message Age By Region\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"googlecloud.pubsub.topic.oldest_unacked_message_age_by_region.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Topic Oldest Unacked Message Age By Region\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"ed36f31e-ed2a-460a-a881-18e191f75d04\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Topic Oldest Unacked Message Age By Region\\\",\\\"ed36f31e-ed2a-460a-a881-18e191f75d04\\\":\\\"Top values of googlecloud.labels.metrics.region\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"ed36f31e-ed2a-460a-a881-18e191f75d04\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.metrics.region\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.topic.oldest_unacked_message_age_by_region.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-ed36f31e-ed2a-460a-a881-18e191f75d04\\\":{\\\"label\\\":\\\"Top values of gcp.labels.metrics.region\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.metrics.region\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"ed36f31e-ed2a-460a-a881-18e191f75d04\\\"},\\\"col-2-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"label\\\":\\\"Topic Oldest Unacked Message Age By Region\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"gcp.pubsub.topic.oldest_unacked_message_age_by_region.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Topic Oldest Unacked Message Age By Region\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"ed36f31e-ed2a-460a-a881-18e191f75d04\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Topic Oldest Unacked Message Age By Region\\\",\\\"ed36f31e-ed2a-460a-a881-18e191f75d04\\\":\\\"Top values of gcp.labels.metrics.region\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -608,7 +608,7 @@ "0888bf93-1ecf-467a-b0b5-9e0deee6545c": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.resource.topic_id", + "label": "Top values of gcp.labels.resource.topic_id", "operationType": "terms", "params": { "orderBy": { @@ -619,7 +619,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.resource.topic_id" + "sourceField": "gcp.labels.resource.topic_id" }, "5424865c-c988-4e26-b00b-b3cf90e1e4cf": { "customLabel": true, @@ -628,7 +628,7 @@ "label": "Topic Oldest Unacked Message Age By Region", "operationType": "avg", "scale": "ratio", - "sourceField": "googlecloud.pubsub.topic.oldest_unacked_message_age_by_region.value", + "sourceField": "gcp.pubsub.topic.oldest_unacked_message_age_by_region.value", "suggestedPriority": 0 }, "6be62612-437b-448d-9631-c6cc0938225d": { @@ -645,7 +645,7 @@ "ed36f31e-ed2a-460a-a881-18e191f75d04": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.metrics.region", + "label": "Top values of gcp.labels.metrics.region", "operationType": "terms", "params": { "orderBy": { @@ -656,7 +656,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.metrics.region" + "sourceField": "gcp.labels.metrics.region" } }, "indexPatternId": "metricbeat-*" @@ -691,7 +691,7 @@ "preferredSeriesType": "line" } }, - "title": "Topic Oldest Unacked Message Age By Region [Metricbeat Googlecloud]", + "title": "Topic Oldest Unacked Message Age By Region [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "5f97d300-01a1-11eb-b032-d59f894a5072", @@ -709,7 +709,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.resource.subscription_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.subscription.oldest_unacked_message_age.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"dataType\\\":\\\"date\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"@timestamp\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"scale\\\":\\\"interval\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-2251f8b6-6091-4386-890b-4d0d33e79a96\\\":{\\\"dataType\\\":\\\"string\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"Top values of googlecloud.labels.resource.subscription_id\\\",\\\"operationType\\\":\\\"terms\\\",\\\"params\\\":{\\\"orderBy\\\":{\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"type\\\":\\\"column\\\"},\\\"orderDirection\\\":\\\"desc\\\",\\\"size\\\":3},\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.resource.subscription_id\\\",\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"customLabel\\\":true,\\\"dataType\\\":\\\"number\\\",\\\"isBucketed\\\":false,\\\"label\\\":\\\"Subscription Oldest Unacked Message Age\\\",\\\"operationType\\\":\\\"avg\\\",\\\"scale\\\":\\\"ratio\\\",\\\"sourceField\\\":\\\"googlecloud.pubsub.subscription.oldest_unacked_message_age.value\\\",\\\"suggestedPriority\\\":0,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Subscription Oldest Unacked Message Age\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"2251f8b6-6091-4386-890b-4d0d33e79a96\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Subscription Oldest Unacked Message Age\\\",\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\":\\\"Top values of googlecloud.labels.resource.subscription_id\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.resource.subscription_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.subscription.oldest_unacked_message_age.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"dataType\\\":\\\"date\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"@timestamp\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"scale\\\":\\\"interval\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-2251f8b6-6091-4386-890b-4d0d33e79a96\\\":{\\\"dataType\\\":\\\"string\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"Top values of gcp.labels.resource.subscription_id\\\",\\\"operationType\\\":\\\"terms\\\",\\\"params\\\":{\\\"orderBy\\\":{\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"type\\\":\\\"column\\\"},\\\"orderDirection\\\":\\\"desc\\\",\\\"size\\\":3},\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.resource.subscription_id\\\",\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"customLabel\\\":true,\\\"dataType\\\":\\\"number\\\",\\\"isBucketed\\\":false,\\\"label\\\":\\\"Subscription Oldest Unacked Message Age\\\",\\\"operationType\\\":\\\"avg\\\",\\\"scale\\\":\\\"ratio\\\",\\\"sourceField\\\":\\\"gcp.pubsub.subscription.oldest_unacked_message_age.value\\\",\\\"suggestedPriority\\\":0,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Subscription Oldest Unacked Message Age\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"2251f8b6-6091-4386-890b-4d0d33e79a96\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Subscription Oldest Unacked Message Age\\\",\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\":\\\"Top values of gcp.labels.resource.subscription_id\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -733,7 +733,7 @@ "2251f8b6-6091-4386-890b-4d0d33e79a96": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.resource.subscription_id", + "label": "Top values of gcp.labels.resource.subscription_id", "operationType": "terms", "params": { "orderBy": { @@ -744,7 +744,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.resource.subscription_id" + "sourceField": "gcp.labels.resource.subscription_id" }, "5424865c-c988-4e26-b00b-b3cf90e1e4cf": { "customLabel": true, @@ -753,7 +753,7 @@ "label": "Subscription Oldest Unacked Message Age", "operationType": "avg", "scale": "ratio", - "sourceField": "googlecloud.pubsub.subscription.oldest_unacked_message_age.value", + "sourceField": "gcp.pubsub.subscription.oldest_unacked_message_age.value", "suggestedPriority": 0 }, "6be62612-437b-448d-9631-c6cc0938225d": { @@ -800,7 +800,7 @@ "preferredSeriesType": "line" } }, - "title": "Subscription Oldest Unacked Message [Metricbeat Googlecloud]", + "title": "Subscription Oldest Unacked Message [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "403d81e0-01a0-11eb-b032-d59f894a5072", @@ -818,7 +818,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.resource.subscription_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.subscription.num_undelivered_messages.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"dataType\\\":\\\"date\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"@timestamp\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"scale\\\":\\\"interval\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-2251f8b6-6091-4386-890b-4d0d33e79a96\\\":{\\\"dataType\\\":\\\"string\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"Top values of googlecloud.labels.resource.subscription_id\\\",\\\"operationType\\\":\\\"terms\\\",\\\"params\\\":{\\\"orderBy\\\":{\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"type\\\":\\\"column\\\"},\\\"orderDirection\\\":\\\"desc\\\",\\\"size\\\":3},\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.resource.subscription_id\\\",\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"customLabel\\\":true,\\\"dataType\\\":\\\"number\\\",\\\"isBucketed\\\":false,\\\"label\\\":\\\"Subscription Number of Undelivered Messages\\\",\\\"operationType\\\":\\\"avg\\\",\\\"params\\\":{\\\"format\\\":{\\\"id\\\":\\\"bytes\\\",\\\"params\\\":{\\\"decimals\\\":0}}},\\\"scale\\\":\\\"ratio\\\",\\\"sourceField\\\":\\\"googlecloud.pubsub.subscription.num_undelivered_messages.value\\\",\\\"suggestedPriority\\\":0,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\" | lens_format_column format=\"bytes\" columnId=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" decimals=0}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Subscription Number of Undelivered Messages\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"2251f8b6-6091-4386-890b-4d0d33e79a96\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Subscription Number of Undelivered Messages\\\",\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\":\\\"Top values of googlecloud.labels.resource.subscription_id\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.resource.subscription_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.subscription.num_undelivered_messages.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"dataType\\\":\\\"date\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"@timestamp\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"scale\\\":\\\"interval\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-2251f8b6-6091-4386-890b-4d0d33e79a96\\\":{\\\"dataType\\\":\\\"string\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"Top values of gcp.labels.resource.subscription_id\\\",\\\"operationType\\\":\\\"terms\\\",\\\"params\\\":{\\\"orderBy\\\":{\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"type\\\":\\\"column\\\"},\\\"orderDirection\\\":\\\"desc\\\",\\\"size\\\":3},\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.resource.subscription_id\\\",\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"customLabel\\\":true,\\\"dataType\\\":\\\"number\\\",\\\"isBucketed\\\":false,\\\"label\\\":\\\"Subscription Number of Undelivered Messages\\\",\\\"operationType\\\":\\\"avg\\\",\\\"params\\\":{\\\"format\\\":{\\\"id\\\":\\\"bytes\\\",\\\"params\\\":{\\\"decimals\\\":0}}},\\\"scale\\\":\\\"ratio\\\",\\\"sourceField\\\":\\\"gcp.pubsub.subscription.num_undelivered_messages.value\\\",\\\"suggestedPriority\\\":0,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\" | lens_format_column format=\"bytes\" columnId=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" decimals=0}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Subscription Number of Undelivered Messages\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"2251f8b6-6091-4386-890b-4d0d33e79a96\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Subscription Number of Undelivered Messages\\\",\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\":\\\"Top values of gcp.labels.resource.subscription_id\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -842,7 +842,7 @@ "2251f8b6-6091-4386-890b-4d0d33e79a96": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.resource.subscription_id", + "label": "Top values of gcp.labels.resource.subscription_id", "operationType": "terms", "params": { "orderBy": { @@ -853,7 +853,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.resource.subscription_id" + "sourceField": "gcp.labels.resource.subscription_id" }, "5424865c-c988-4e26-b00b-b3cf90e1e4cf": { "customLabel": true, @@ -870,7 +870,7 @@ } }, "scale": "ratio", - "sourceField": "googlecloud.pubsub.subscription.num_undelivered_messages.value", + "sourceField": "gcp.pubsub.subscription.num_undelivered_messages.value", "suggestedPriority": 0 }, "6be62612-437b-448d-9631-c6cc0938225d": { @@ -917,7 +917,7 @@ "preferredSeriesType": "line" } }, - "title": "Subscription Number of Undelivered Messages [Metricbeat Googlecloud]", + "title": "Subscription Number of Undelivered Messages [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "11d06fc0-01a0-11eb-b032-d59f894a5072", @@ -935,7 +935,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"auto\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.resource.snapshot_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.snapshot.oldest_message_age.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"auto\\\"},\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-921ee447-0c37-4e9d-9f42-a491f412baef\\\":{\\\"label\\\":\\\"Top values of googlecloud.labels.resource.snapshot_id\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.resource.snapshot_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"label\\\":\\\"Snapshot Oldest Message\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"googlecloud.pubsub.snapshot.oldest_message_age.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Snapshot Oldest Message\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"921ee447-0c37-4e9d-9f42-a491f412baef\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Snapshot Oldest Message\\\",\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\":\\\"Top values of googlecloud.labels.resource.snapshot_id\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"auto\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.resource.snapshot_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.snapshot.oldest_message_age.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"auto\\\"},\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-921ee447-0c37-4e9d-9f42-a491f412baef\\\":{\\\"label\\\":\\\"Top values of gcp.labels.resource.snapshot_id\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.resource.snapshot_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"label\\\":\\\"Snapshot Oldest Message\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"gcp.pubsub.snapshot.oldest_message_age.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Snapshot Oldest Message\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"921ee447-0c37-4e9d-9f42-a491f412baef\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Snapshot Oldest Message\\\",\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\":\\\"Top values of gcp.labels.resource.snapshot_id\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -963,7 +963,7 @@ "label": "Snapshot Oldest Message", "operationType": "avg", "scale": "ratio", - "sourceField": "googlecloud.pubsub.snapshot.oldest_message_age.value", + "sourceField": "gcp.pubsub.snapshot.oldest_message_age.value", "suggestedPriority": 0 }, "6be62612-437b-448d-9631-c6cc0938225d": { @@ -980,7 +980,7 @@ "921ee447-0c37-4e9d-9f42-a491f412baef": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.resource.snapshot_id", + "label": "Top values of gcp.labels.resource.snapshot_id", "operationType": "terms", "params": { "orderBy": { @@ -991,7 +991,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.resource.snapshot_id" + "sourceField": "gcp.labels.resource.snapshot_id" } }, "indexPatternId": "metricbeat-*" @@ -1026,7 +1026,7 @@ "preferredSeriesType": "line" } }, - "title": "Snapshot Oldest Message [Metricbeat Googlecloud]", + "title": "Snapshot Oldest Message [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "f3e92c10-019d-11eb-b032-d59f894a5072", @@ -1044,7 +1044,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"auto\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"ef2fc668-040b-4c82-9f65-5d3fb25c9536\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.resource.snapshot_id\\\",\\\"orderBy\\\":\\\"_key\\\",\\\"order\\\":\\\"asc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.snapshot.num_messages.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"auto\\\"},\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-ef2fc668-040b-4c82-9f65-5d3fb25c9536\\\":{\\\"label\\\":\\\"Top values of googlecloud.labels.resource.snapshot_id\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.resource.snapshot_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"alphabetical\\\"},\\\"orderDirection\\\":\\\"asc\\\"},\\\"id\\\":\\\"ef2fc668-040b-4c82-9f65-5d3fb25c9536\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"label\\\":\\\"Snapshot Number of Messages\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"googlecloud.pubsub.snapshot.num_messages.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Snapshot Number of Messages\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"ef2fc668-040b-4c82-9f65-5d3fb25c9536\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Snapshot Number of Messages\\\",\\\"ef2fc668-040b-4c82-9f65-5d3fb25c9536\\\":\\\"Top values of googlecloud.labels.resource.snapshot_id\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"auto\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"ef2fc668-040b-4c82-9f65-5d3fb25c9536\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.resource.snapshot_id\\\",\\\"orderBy\\\":\\\"_key\\\",\\\"order\\\":\\\"asc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.snapshot.num_messages.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"auto\\\"},\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-ef2fc668-040b-4c82-9f65-5d3fb25c9536\\\":{\\\"label\\\":\\\"Top values of gcp.labels.resource.snapshot_id\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.resource.snapshot_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"alphabetical\\\"},\\\"orderDirection\\\":\\\"asc\\\"},\\\"id\\\":\\\"ef2fc668-040b-4c82-9f65-5d3fb25c9536\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"label\\\":\\\"Snapshot Number of Messages\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"gcp.pubsub.snapshot.num_messages.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"customLabel\\\":true,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\"}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Snapshot Number of Messages\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"ef2fc668-040b-4c82-9f65-5d3fb25c9536\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Snapshot Number of Messages\\\",\\\"ef2fc668-040b-4c82-9f65-5d3fb25c9536\\\":\\\"Top values of gcp.labels.resource.snapshot_id\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -1072,7 +1072,7 @@ "label": "Snapshot Number of Messages", "operationType": "avg", "scale": "ratio", - "sourceField": "googlecloud.pubsub.snapshot.num_messages.value", + "sourceField": "gcp.pubsub.snapshot.num_messages.value", "suggestedPriority": 0 }, "6be62612-437b-448d-9631-c6cc0938225d": { @@ -1089,7 +1089,7 @@ "ef2fc668-040b-4c82-9f65-5d3fb25c9536": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.resource.snapshot_id", + "label": "Top values of gcp.labels.resource.snapshot_id", "operationType": "terms", "params": { "orderBy": { @@ -1099,7 +1099,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.resource.snapshot_id" + "sourceField": "gcp.labels.resource.snapshot_id" } }, "indexPatternId": "metricbeat-*" @@ -1134,7 +1134,7 @@ "preferredSeriesType": "line" } }, - "title": "Snapshot Number of Messages [Metricbeat Googlecloud]", + "title": "Snapshot Number of Messages [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "6de1f430-019d-11eb-b032-d59f894a5072", @@ -1152,7 +1152,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"auto\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.resource.snapshot_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.snapshot.backlog_bytes.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"auto\\\"},\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-921ee447-0c37-4e9d-9f42-a491f412baef\\\":{\\\"label\\\":\\\"Top values of googlecloud.labels.resource.snapshot_id\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.resource.snapshot_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"label\\\":\\\"Snapshot Backlog Bytes\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"googlecloud.pubsub.snapshot.backlog_bytes.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"params\\\":{\\\"format\\\":{\\\"id\\\":\\\"bytes\\\",\\\"params\\\":{\\\"decimals\\\":0}}},\\\"customLabel\\\":true,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\" | lens_format_column format=\"bytes\" columnId=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" decimals=0}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Snapshot Backlog Bytes\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"921ee447-0c37-4e9d-9f42-a491f412baef\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Snapshot Backlog Bytes\\\",\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\":\\\"Top values of googlecloud.labels.resource.snapshot_id\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"auto\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.resource.snapshot_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.snapshot.backlog_bytes.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"label\\\":\\\"@timestamp\\\",\\\"dataType\\\":\\\"date\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"isBucketed\\\":true,\\\"scale\\\":\\\"interval\\\",\\\"params\\\":{\\\"interval\\\":\\\"auto\\\"},\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-921ee447-0c37-4e9d-9f42-a491f412baef\\\":{\\\"label\\\":\\\"Top values of gcp.labels.resource.snapshot_id\\\",\\\"dataType\\\":\\\"string\\\",\\\"operationType\\\":\\\"terms\\\",\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.resource.snapshot_id\\\",\\\"isBucketed\\\":true,\\\"params\\\":{\\\"size\\\":3,\\\"orderBy\\\":{\\\"type\\\":\\\"column\\\",\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"},\\\"orderDirection\\\":\\\"desc\\\"},\\\"id\\\":\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"label\\\":\\\"Snapshot Backlog Bytes\\\",\\\"dataType\\\":\\\"number\\\",\\\"operationType\\\":\\\"avg\\\",\\\"suggestedPriority\\\":0,\\\"sourceField\\\":\\\"gcp.pubsub.snapshot.backlog_bytes.value\\\",\\\"isBucketed\\\":false,\\\"scale\\\":\\\"ratio\\\",\\\"params\\\":{\\\"format\\\":{\\\"id\\\":\\\"bytes\\\",\\\"params\\\":{\\\"decimals\\\":0}}},\\\"customLabel\\\":true,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\" | lens_format_column format=\"bytes\" columnId=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" decimals=0}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Snapshot Backlog Bytes\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"921ee447-0c37-4e9d-9f42-a491f412baef\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Snapshot Backlog Bytes\\\",\\\"921ee447-0c37-4e9d-9f42-a491f412baef\\\":\\\"Top values of gcp.labels.resource.snapshot_id\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -1188,7 +1188,7 @@ } }, "scale": "ratio", - "sourceField": "googlecloud.pubsub.snapshot.backlog_bytes.value", + "sourceField": "gcp.pubsub.snapshot.backlog_bytes.value", "suggestedPriority": 0 }, "6be62612-437b-448d-9631-c6cc0938225d": { @@ -1205,7 +1205,7 @@ "921ee447-0c37-4e9d-9f42-a491f412baef": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.resource.snapshot_id", + "label": "Top values of gcp.labels.resource.snapshot_id", "operationType": "terms", "params": { "orderBy": { @@ -1216,7 +1216,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.resource.snapshot_id" + "sourceField": "gcp.labels.resource.snapshot_id" } }, "indexPatternId": "metricbeat-*" @@ -1251,7 +1251,7 @@ "preferredSeriesType": "line" } }, - "title": "Snapshot Backlog Bytes [Metricbeat Googlecloud]", + "title": "Snapshot Backlog Bytes [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "0776dbf0-019f-11eb-b032-d59f894a5072", @@ -1269,7 +1269,7 @@ { "attributes": { "description": "", - "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.labels.resource.subscription_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"googlecloud.pubsub.subscription.backlog_bytes.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"dataType\\\":\\\"date\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"@timestamp\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"scale\\\":\\\"interval\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-2251f8b6-6091-4386-890b-4d0d33e79a96\\\":{\\\"dataType\\\":\\\"string\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"Top values of googlecloud.labels.resource.subscription_id\\\",\\\"operationType\\\":\\\"terms\\\",\\\"params\\\":{\\\"orderBy\\\":{\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"type\\\":\\\"column\\\"},\\\"orderDirection\\\":\\\"desc\\\",\\\"size\\\":3},\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"googlecloud.labels.resource.subscription_id\\\",\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"customLabel\\\":true,\\\"dataType\\\":\\\"number\\\",\\\"isBucketed\\\":false,\\\"label\\\":\\\"Subscription Backlog Bytes\\\",\\\"operationType\\\":\\\"avg\\\",\\\"params\\\":{\\\"format\\\":{\\\"id\\\":\\\"bytes\\\",\\\"params\\\":{\\\"decimals\\\":0}}},\\\"scale\\\":\\\"ratio\\\",\\\"sourceField\\\":\\\"googlecloud.pubsub.subscription.backlog_bytes.value\\\",\\\"suggestedPriority\\\":0,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\" | lens_format_column format=\"bytes\" columnId=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" decimals=0}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Subscription Backlog Bytes\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"2251f8b6-6091-4386-890b-4d0d33e79a96\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Subscription Backlog Bytes\\\",\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\":\\\"Top values of googlecloud.labels.resource.subscription_id\\\"}\"}", + "expression": "kibana\n| kibana_context query=\"{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"}\" filters=\"[]\"\n| lens_merge_tables layerIds=\"91e62734-6524-424c-b2b5-3974c835dd6c\" \n tables={esaggs index=\"metricbeat-*\" metricsAtAllLevels=true partialRows=true includeFormatHints=true timeFields=\"@timestamp\" aggConfigs=\"[{\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"date_histogram\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"@timestamp\\\",\\\"useNormalizedEsInterval\\\":true,\\\"interval\\\":\\\"1m\\\",\\\"drop_partials\\\":false,\\\"min_doc_count\\\":0,\\\"extended_bounds\\\":{}}},{\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"terms\\\",\\\"schema\\\":\\\"segment\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.labels.resource.subscription_id\\\",\\\"orderBy\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"order\\\":\\\"desc\\\",\\\"size\\\":3,\\\"otherBucket\\\":false,\\\"otherBucketLabel\\\":\\\"Other\\\",\\\"missingBucket\\\":false,\\\"missingBucketLabel\\\":\\\"Missing\\\"}},{\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"enabled\\\":true,\\\"type\\\":\\\"avg\\\",\\\"schema\\\":\\\"metric\\\",\\\"params\\\":{\\\"field\\\":\\\"gcp.pubsub.subscription.backlog_bytes.value\\\",\\\"missing\\\":0}}]\" | lens_rename_columns idMap=\"{\\\"col-0-6be62612-437b-448d-9631-c6cc0938225d\\\":{\\\"dataType\\\":\\\"date\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"@timestamp\\\",\\\"operationType\\\":\\\"date_histogram\\\",\\\"params\\\":{\\\"interval\\\":\\\"1m\\\"},\\\"scale\\\":\\\"interval\\\",\\\"sourceField\\\":\\\"@timestamp\\\",\\\"id\\\":\\\"6be62612-437b-448d-9631-c6cc0938225d\\\"},\\\"col-2-2251f8b6-6091-4386-890b-4d0d33e79a96\\\":{\\\"dataType\\\":\\\"string\\\",\\\"isBucketed\\\":true,\\\"label\\\":\\\"Top values of gcp.labels.resource.subscription_id\\\",\\\"operationType\\\":\\\"terms\\\",\\\"params\\\":{\\\"orderBy\\\":{\\\"columnId\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\",\\\"type\\\":\\\"column\\\"},\\\"orderDirection\\\":\\\"desc\\\",\\\"size\\\":3},\\\"scale\\\":\\\"ordinal\\\",\\\"sourceField\\\":\\\"gcp.labels.resource.subscription_id\\\",\\\"id\\\":\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\"},\\\"col-3-5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":{\\\"customLabel\\\":true,\\\"dataType\\\":\\\"number\\\",\\\"isBucketed\\\":false,\\\"label\\\":\\\"Subscription Backlog Bytes\\\",\\\"operationType\\\":\\\"avg\\\",\\\"params\\\":{\\\"format\\\":{\\\"id\\\":\\\"bytes\\\",\\\"params\\\":{\\\"decimals\\\":0}}},\\\"scale\\\":\\\"ratio\\\",\\\"sourceField\\\":\\\"gcp.pubsub.subscription.backlog_bytes.value\\\",\\\"suggestedPriority\\\":0,\\\"id\\\":\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\"}}\" | lens_format_column format=\"bytes\" columnId=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" decimals=0}\n| lens_xy_chart xTitle=\"@timestamp\" yTitle=\"Subscription Backlog Bytes\" legend={lens_xy_legendConfig isVisible=true position=\"right\"} fittingFunction=\"None\" \n layers={lens_xy_layer layerId=\"91e62734-6524-424c-b2b5-3974c835dd6c\" hide=false xAccessor=\"6be62612-437b-448d-9631-c6cc0938225d\" yScaleType=\"linear\" xScaleType=\"time\" isHistogram=true splitAccessor=\"2251f8b6-6091-4386-890b-4d0d33e79a96\" seriesType=\"line\" accessors=\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\" columnToLabel=\"{\\\"5424865c-c988-4e26-b00b-b3cf90e1e4cf\\\":\\\"Subscription Backlog Bytes\\\",\\\"2251f8b6-6091-4386-890b-4d0d33e79a96\\\":\\\"Top values of gcp.labels.resource.subscription_id\\\"}\"}", "state": { "datasourceMetaData": { "filterableIndexPatterns": [ @@ -1293,7 +1293,7 @@ "2251f8b6-6091-4386-890b-4d0d33e79a96": { "dataType": "string", "isBucketed": true, - "label": "Top values of googlecloud.labels.resource.subscription_id", + "label": "Top values of gcp.labels.resource.subscription_id", "operationType": "terms", "params": { "orderBy": { @@ -1304,7 +1304,7 @@ "size": 3 }, "scale": "ordinal", - "sourceField": "googlecloud.labels.resource.subscription_id" + "sourceField": "gcp.labels.resource.subscription_id" }, "5424865c-c988-4e26-b00b-b3cf90e1e4cf": { "customLabel": true, @@ -1321,7 +1321,7 @@ } }, "scale": "ratio", - "sourceField": "googlecloud.pubsub.subscription.backlog_bytes.value", + "sourceField": "gcp.pubsub.subscription.backlog_bytes.value", "suggestedPriority": 0 }, "6be62612-437b-448d-9631-c6cc0938225d": { @@ -1368,7 +1368,7 @@ "preferredSeriesType": "line" } }, - "title": "Subscription Backlog [Metricbeat Googlecloud]", + "title": "Subscription Backlog [Metricbeat GCP]", "visualizationType": "lnsXY" }, "id": "79d80f10-01a0-11eb-b032-d59f894a5072", diff --git a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-storage-overview.json b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-storage-overview.json similarity index 89% rename from x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-storage-overview.json rename to x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-storage-overview.json index 47232312041..f14e2752632 100644 --- a/x-pack/metricbeat/module/googlecloud/_meta/kibana/7/dashboard/Metricbeat-googlecloud-storage-overview.json +++ b/x-pack/metricbeat/module/gcp/_meta/kibana/7/dashboard/Metricbeat-gcp-storage-overview.json @@ -2,7 +2,7 @@ "objects": [ { "attributes": { - "description": "Overview of Googlecloud Storage Metrics", + "description": "Overview of GCP Storage Metrics", "hits": 0, "kibanaSavedObjectMeta": { "searchSourceJSON": { @@ -116,7 +116,7 @@ } ], "timeRestore": false, - "title": "[Metricbeat Googlecloud] Storage Overview", + "title": "[Metricbeat GCP] Storage Overview", "version": 1 }, "id": "ca401040-8e52-11ea-9fa6-4d675d5290dc", @@ -165,7 +165,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Storage Filters [Metricbeat GoogleCloud]", + "title": "Storage Filters [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -173,7 +173,7 @@ "params": { "controls": [ { - "fieldName": "googlecloud.labels.resource.bucket_name", + "fieldName": "gcp.labels.resource.bucket_name", "id": "1588628954328", "indexPatternRefName": "control_0_index_pattern", "label": "Bucket Name", @@ -188,7 +188,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.resource.location", + "fieldName": "gcp.labels.resource.location", "id": "1588628981768", "indexPatternRefName": "control_1_index_pattern", "label": "Location", @@ -203,7 +203,7 @@ "type": "list" }, { - "fieldName": "googlecloud.labels.metrics.storage_class", + "fieldName": "gcp.labels.metrics.storage_class", "id": "1588629001851", "indexPatternRefName": "control_2_index_pattern", "label": "Storage Class", @@ -222,7 +222,7 @@ "updateFiltersOnChange": false, "useTimeFilter": false }, - "title": "Storage Filters [Metricbeat GoogleCloud]", + "title": "Storage Filters [Metricbeat GCP]", "type": "input_control_vis" } }, @@ -257,7 +257,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Storage Total Bytes [Metricbeat GoogleCloud]", + "title": "Storage Total Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -291,7 +291,7 @@ "fill": "0", "filter": { "language": "kuery", - "query": "googlecloud.storage.storage.total_bytes.value : * " + "query": "gcp.storage.storage.total_bytes.value : * " }, "formatter": "bytes", "id": "61ca57f1-469d-11e7-af02-69e470af7417", @@ -299,7 +299,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.storage.storage.total_bytes.value", + "field": "gcp.storage.storage.total_bytes.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -309,7 +309,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_field": "gcp.labels.resource.bucket_name", "terms_include": "", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" @@ -321,7 +321,7 @@ "time_range_mode": "last_value", "type": "top_n" }, - "title": "Storage Total Bytes [Metricbeat GoogleCloud]", + "title": "Storage Total Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -340,7 +340,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Storage Object Count [Metricbeat GoogleCloud]", + "title": "Storage Object Count [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -376,7 +376,7 @@ "fill": "0", "filter": { "language": "kuery", - "query": "googlecloud.storage.storage.object_count.value : * " + "query": "gcp.storage.storage.object_count.value : * " }, "formatter": "number", "id": "61ca57f1-469d-11e7-af02-69e470af7417", @@ -384,7 +384,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.storage.storage.object_count.value", + "field": "gcp.storage.storage.object_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -394,7 +394,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_field": "gcp.labels.resource.bucket_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -404,7 +404,7 @@ "time_field": "", "type": "top_n" }, - "title": "Storage Object Count [Metricbeat GoogleCloud]", + "title": "Storage Object Count [Metricbeat GCP]", "type": "metrics" } }, @@ -423,7 +423,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Storage API Request Count [Metricbeat GoogleCloud]", + "title": "Storage API Request Count [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -450,7 +450,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.storage.api.request_count.value", + "field": "gcp.storage.api.request_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -460,7 +460,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_field": "gcp.labels.resource.bucket_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -470,7 +470,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Storage API Request Count [Metricbeat GoogleCloud]", + "title": "Storage API Request Count [Metricbeat GCP]", "type": "metrics" } }, @@ -489,7 +489,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Storage Network Received Bytes [Metricbeat GoogleCloud]", + "title": "Storage Network Received Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -516,7 +516,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.storage.network.received_bytes_count.value", + "field": "gcp.storage.network.received_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -526,7 +526,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_field": "gcp.labels.resource.bucket_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -536,7 +536,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Storage Network Received Bytes [Metricbeat GoogleCloud]", + "title": "Storage Network Received Bytes [Metricbeat GCP]", "type": "metrics" } }, @@ -555,7 +555,7 @@ "kibanaSavedObjectMeta": { "searchSourceJSON": {} }, - "title": "Storage Network Sent Bytes [Metricbeat GoogleCloud]", + "title": "Storage Network Sent Bytes [Metricbeat GCP]", "uiStateJSON": {}, "version": 1, "visState": { @@ -582,7 +582,7 @@ "line_width": "2", "metrics": [ { - "field": "googlecloud.storage.network.sent_bytes_count.value", + "field": "gcp.storage.network.sent_bytes_count.value", "id": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "avg" } @@ -592,7 +592,7 @@ "split_color_mode": "rainbow", "split_mode": "terms", "stacked": "none", - "terms_field": "googlecloud.labels.resource.bucket_name", + "terms_field": "gcp.labels.resource.bucket_name", "terms_order_by": "61ca57f2-469d-11e7-af02-69e470af7417", "type": "timeseries" } @@ -602,7 +602,7 @@ "time_field": "", "type": "timeseries" }, - "title": "Storage Network Sent Bytes [Metricbeat GoogleCloud]", + "title": "Storage Network Sent Bytes [Metricbeat GCP]", "type": "metrics" } }, diff --git a/x-pack/metricbeat/module/googlecloud/billing/_meta/data.json b/x-pack/metricbeat/module/gcp/billing/_meta/data.json similarity index 79% rename from x-pack/metricbeat/module/googlecloud/billing/_meta/data.json rename to x-pack/metricbeat/module/gcp/billing/_meta/data.json index 5000711030a..a9b52f82898 100644 --- a/x-pack/metricbeat/module/googlecloud/billing/_meta/data.json +++ b/x-pack/metricbeat/module/gcp/billing/_meta/data.json @@ -4,11 +4,11 @@ "cloud.account.name": "elastic-bi", "cloud.provider": "gcp", "event": { - "dataset": "googlecloud.billing", + "dataset": "gcp.billing", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "billing": { "cost_type": "regular", "invoice_month": "202010", @@ -21,6 +21,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } } \ No newline at end of file diff --git a/x-pack/metricbeat/module/googlecloud/billing/_meta/docs.asciidoc b/x-pack/metricbeat/module/gcp/billing/_meta/docs.asciidoc similarity index 100% rename from x-pack/metricbeat/module/googlecloud/billing/_meta/docs.asciidoc rename to x-pack/metricbeat/module/gcp/billing/_meta/docs.asciidoc diff --git a/x-pack/metricbeat/module/googlecloud/billing/_meta/fields.yml b/x-pack/metricbeat/module/gcp/billing/_meta/fields.yml similarity index 100% rename from x-pack/metricbeat/module/googlecloud/billing/_meta/fields.yml rename to x-pack/metricbeat/module/gcp/billing/_meta/fields.yml diff --git a/x-pack/metricbeat/module/googlecloud/billing/billing.go b/x-pack/metricbeat/module/gcp/billing/billing.go similarity index 98% rename from x-pack/metricbeat/module/googlecloud/billing/billing.go rename to x-pack/metricbeat/module/gcp/billing/billing.go index 16cdbccf090..13236ff4ae4 100644 --- a/x-pack/metricbeat/module/googlecloud/billing/billing.go +++ b/x-pack/metricbeat/module/gcp/billing/billing.go @@ -20,7 +20,7 @@ import ( "github.com/elastic/beats/v7/libbeat/common/cfgwarn" "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" ) const ( @@ -33,7 +33,7 @@ const ( // the MetricSet for each host defined in the module's configuration. After the // MetricSet has been created then Fetch will begin to be called periodically. func init() { - mb.Registry.MustAddMetricSet(googlecloud.ModuleName, metricsetName, New) + mb.Registry.MustAddMetricSet(gcp.ModuleName, metricsetName, New) } // MetricSet holds any configuration or state information. It must implement diff --git a/x-pack/metricbeat/module/googlecloud/billing/billing_integration_test.go b/x-pack/metricbeat/module/gcp/billing/billing_integration_test.go similarity index 85% rename from x-pack/metricbeat/module/googlecloud/billing/billing_integration_test.go rename to x-pack/metricbeat/module/gcp/billing/billing_integration_test.go index 0a4af506057..9c006fb30cc 100644 --- a/x-pack/metricbeat/module/googlecloud/billing/billing_integration_test.go +++ b/x-pack/metricbeat/module/gcp/billing/billing_integration_test.go @@ -3,7 +3,7 @@ // you may not use this file except in compliance with the Elastic License. // +build integration -// +build googlecloud +// +build gcp package billing @@ -11,7 +11,7 @@ import ( "testing" mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func TestData(t *testing.T) { diff --git a/x-pack/metricbeat/module/googlecloud/billing/billing_test.go b/x-pack/metricbeat/module/gcp/billing/billing_test.go similarity index 100% rename from x-pack/metricbeat/module/googlecloud/billing/billing_test.go rename to x-pack/metricbeat/module/gcp/billing/billing_test.go diff --git a/x-pack/metricbeat/module/gcp/compute/_meta/data.json b/x-pack/metricbeat/module/gcp/compute/_meta/data.json new file mode 100644 index 00000000000..da778966af8 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/compute/_meta/data.json @@ -0,0 +1,73 @@ +{ + "@timestamp": "2017-10-12T08:05:34.853Z", + "cloud": { + "account": { + "id": "elastic-observability", + "name": "elastic-observability" + }, + "instance": { + "id": "8358623250631840944", + "name": "rhodes-spacetime-1" + }, + "machine": { + "type": "e2-micro" + }, + "provider": "gcp" + }, + "cloud.availability_zone": "us-central1-a", + "cloud.region": "us-central1", + "event": { + "dataset": "gcp.compute", + "duration": 115000, + "module": "gcp" + }, + "gcp": { + "compute": { + "instance": { + "network": { + "received_bytes_count": { + "value": 49837 + }, + "received_packets_count": { + "value": 229 + }, + "sent_bytes_count": { + "value": 1018967 + }, + "sent_packets_count": { + "value": 752 + } + } + } + }, + "labels": { + "metrics": { + "loadbalanced": "false" + }, + "user": { + "created-by": "ks" + } + } + }, + "host": { + "id": "8358623250631840944", + "name": "rhodes-spacetime-1", + "network": { + "in": { + "bytes": 1018967, + "packets": 752 + }, + "out": { + "bytes": 49837, + "packets": 229 + } + } + }, + "metricset": { + "name": "compute", + "period": 10000 + }, + "service": { + "type": "gcp" + } +} \ No newline at end of file diff --git a/x-pack/metricbeat/module/gcp/compute/_meta/data_cpu.json b/x-pack/metricbeat/module/gcp/compute/_meta/data_cpu.json new file mode 100644 index 00000000000..7901136bd62 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/compute/_meta/data_cpu.json @@ -0,0 +1,87 @@ +{ + "@timestamp": "2017-10-12T08:05:34.853Z", + "cloud": { + "account": { + "id": "elastic-observability", + "name": "elastic-observability" + }, + "instance": { + "id": "8358623250631840944", + "name": "rhodes-spacetime-1" + }, + "machine": { + "type": "e2-micro" + }, + "provider": "gcp" + }, + "cloud.availability_zone": "us-central1-a", + "cloud.region": "us-central1", + "event": { + "dataset": "gcp.compute", + "duration": 115000, + "module": "gcp" + }, + "gcp": { + "compute": { + "firewall": { + "dropped_bytes_count": { + "value": 72 + }, + "dropped_packets_count": { + "value": 1 + } + }, + "instance": { + "cpu": { + "reserved_cores": { + "value": 0.5 + }, + "usage_time": { + "value": 1.851312024924482 + }, + "utilization": { + "value": 0.06171040083081607 + } + }, + "memory": { + "balloon": { + "ram_size": { + "value": 2092478464 + }, + "ram_used": { + "value": 1155657728 + }, + "swap_in_bytes_count": { + "value": 0 + }, + "swap_out_bytes_count": { + "value": 0 + } + } + }, + "uptime": { + "value": 60 + } + } + }, + "labels": { + "user": { + "created-by": "ks" + } + } + }, + "host": { + "cpu": { + "pct": 0.06171040083081607 + }, + "id": "8358623250631840944", + "name": "rhodes-spacetime-1" + }, + "metricset": { + "name": "compute", + "period": 10000 + }, + "service": { + "type": "gcp" + } +} \ No newline at end of file diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_disk.json b/x-pack/metricbeat/module/gcp/compute/_meta/data_disk.json similarity index 54% rename from x-pack/metricbeat/module/googlecloud/compute/_meta/data_disk.json rename to x-pack/metricbeat/module/gcp/compute/_meta/data_disk.json index 7a8f923569e..3f0483e6fdc 100644 --- a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_disk.json +++ b/x-pack/metricbeat/module/gcp/compute/_meta/data_disk.json @@ -2,68 +2,72 @@ "@timestamp": "2017-10-12T08:05:34.853Z", "cloud": { "account": { - "id": "elastic-observability" + "id": "elastic-observability", + "name": "elastic-observability" }, "instance": { - "id": "7925831082803123728", - "name": "heartbeat-tokyo" + "id": "6635562622940154046", + "name": "rhodes-spacetime-2" }, "machine": { - "type": "f1-micro" + "type": "e2-micro" }, - "provider": "googlecloud" + "provider": "gcp" }, - "cloud.availability_zone": "asia-northeast1-b", - "cloud.region": "asia-northeast1", + "cloud.availability_zone": "us-central1-a", + "cloud.region": "us-central1", "event": { - "dataset": "googlecloud.compute", + "dataset": "gcp.compute", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "compute": { "instance": { "disk": { "read_bytes_count": { - "value": 0 + "value": 241290 }, "read_ops_count": { - "value": 0 + "value": 5 }, "write_bytes_count": { - "value": 0 + "value": 3655733 }, "write_ops_count": { - "value": 0 + "value": 69 } } } }, "labels": { "metrics": { - "device_name": "disk-1", + "device_name": "rhodes-spacetime-2", "device_type": "permanent", "storage_type": "pd-standard" + }, + "user": { + "created-by": "ks" } } }, "host": { "disk": { "read": { - "bytes": 0 + "bytes": 241290 }, "write": { - "bytes": 0 + "bytes": 3655733 } }, - "id": "7925831082803123728", - "name": "heartbeat-tokyo" + "id": "6635562622940154046", + "name": "rhodes-spacetime-2" }, "metricset": { "name": "compute", "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } } \ No newline at end of file diff --git a/x-pack/metricbeat/module/gcp/compute/_meta/data_firewall.json b/x-pack/metricbeat/module/gcp/compute/_meta/data_firewall.json new file mode 100644 index 00000000000..efbe547b014 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/compute/_meta/data_firewall.json @@ -0,0 +1,83 @@ +{ + "@timestamp": "2017-10-12T08:05:34.853Z", + "cloud": { + "account": { + "id": "elastic-observability", + "name": "elastic-observability" + }, + "instance": { + "id": "2843342272811583081", + "name": "instance-1" + }, + "machine": { + "type": "n1-standard-8" + }, + "provider": "gcp" + }, + "cloud.availability_zone": "us-central1-a", + "cloud.region": "us-central1", + "event": { + "dataset": "gcp.compute", + "duration": 115000, + "module": "gcp" + }, + "gcp": { + "compute": { + "firewall": { + "dropped_bytes_count": { + "value": 608 + }, + "dropped_packets_count": { + "value": 5 + } + }, + "instance": { + "cpu": { + "reserved_cores": { + "value": 0.25 + }, + "usage_time": { + "value": 7.160390726436162 + }, + "utilization": { + "value": 0.47735938176241083 + } + }, + "memory": { + "balloon": { + "ram_size": { + "value": 1035751424 + }, + "ram_used": { + "value": 504037376 + }, + "swap_in_bytes_count": { + "value": 0 + }, + "swap_out_bytes_count": { + "value": 0 + } + } + }, + "uptime": { + "value": 60 + } + } + }, + "labels": {} + }, + "host": { + "cpu": { + "pct": 0.47735938176241083 + }, + "id": "2843342272811583081", + "name": "instance-1" + }, + "metricset": { + "name": "compute", + "period": 10000 + }, + "service": { + "type": "gcp" + } +} \ No newline at end of file diff --git a/x-pack/metricbeat/module/gcp/compute/_meta/data_memory.json b/x-pack/metricbeat/module/gcp/compute/_meta/data_memory.json new file mode 100644 index 00000000000..0087177c935 --- /dev/null +++ b/x-pack/metricbeat/module/gcp/compute/_meta/data_memory.json @@ -0,0 +1,87 @@ +{ + "@timestamp": "2017-10-12T08:05:34.853Z", + "cloud": { + "account": { + "id": "elastic-observability", + "name": "elastic-observability" + }, + "instance": { + "id": "5754458766588945165", + "name": "ks-instance1" + }, + "machine": { + "type": "e2-micro" + }, + "provider": "gcp" + }, + "cloud.availability_zone": "us-central1-a", + "cloud.region": "us-central1", + "event": { + "dataset": "gcp.compute", + "duration": 115000, + "module": "gcp" + }, + "gcp": { + "compute": { + "firewall": { + "dropped_bytes_count": { + "value": 838 + }, + "dropped_packets_count": { + "value": 7 + } + }, + "instance": { + "cpu": { + "reserved_cores": { + "value": 1 + }, + "usage_time": { + "value": 3.7590914278189302 + }, + "utilization": { + "value": 0.06265152379698218 + } + }, + "memory": { + "balloon": { + "ram_size": { + "value": 4140253184 + }, + "ram_used": { + "value": 841588736 + }, + "swap_in_bytes_count": { + "value": 0 + }, + "swap_out_bytes_count": { + "value": 0 + } + } + }, + "uptime": { + "value": 60.00000000023283 + } + } + }, + "labels": { + "user": { + "created-by": "ks" + } + } + }, + "host": { + "cpu": { + "pct": 0.06265152379698218 + }, + "id": "5754458766588945165", + "name": "ks-instance1" + }, + "metricset": { + "name": "compute", + "period": 10000 + }, + "service": { + "type": "gcp" + } +} \ No newline at end of file diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_network.json b/x-pack/metricbeat/module/gcp/compute/_meta/data_network.json similarity index 55% rename from x-pack/metricbeat/module/googlecloud/compute/_meta/data_network.json rename to x-pack/metricbeat/module/gcp/compute/_meta/data_network.json index 22257a87521..10e99d1b695 100644 --- a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_network.json +++ b/x-pack/metricbeat/module/gcp/compute/_meta/data_network.json @@ -2,39 +2,40 @@ "@timestamp": "2017-10-12T08:05:34.853Z", "cloud": { "account": { - "id": "elastic-observability" + "id": "elastic-observability", + "name": "elastic-observability" }, "instance": { - "id": "7925831082803123728", - "name": "heartbeat-tokyo" + "id": "8174466357339614075", + "name": "ron-loadtest-kibana" }, "machine": { - "type": "f1-micro" + "type": "n1-standard-8" }, - "provider": "googlecloud" + "provider": "gcp" }, - "cloud.availability_zone": "asia-northeast1-b", - "cloud.region": "asia-northeast1", + "cloud.availability_zone": "us-central1-a", + "cloud.region": "us-central1", "event": { - "dataset": "googlecloud.compute", + "dataset": "gcp.compute", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "compute": { "instance": { "network": { "received_bytes_count": { - "value": 2866053 + "value": 43502 }, "received_packets_count": { - "value": 2449 + "value": 94 }, "sent_bytes_count": { - "value": 119338 + "value": 202 }, "sent_packets_count": { - "value": 695 + "value": 4 } } } @@ -46,16 +47,16 @@ } }, "host": { - "id": "7925831082803123728", - "name": "heartbeat-tokyo", + "id": "8174466357339614075", + "name": "ron-loadtest-kibana", "network": { "in": { - "bytes": 119338, - "packets": 695 + "bytes": 202, + "packets": 4 }, "out": { - "bytes": 2866053, - "packets": 2449 + "bytes": 43502, + "packets": 94 } } }, @@ -64,6 +65,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } } \ No newline at end of file diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/docs.asciidoc b/x-pack/metricbeat/module/gcp/compute/_meta/docs.asciidoc similarity index 100% rename from x-pack/metricbeat/module/googlecloud/compute/_meta/docs.asciidoc rename to x-pack/metricbeat/module/gcp/compute/_meta/docs.asciidoc diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/fields.yml b/x-pack/metricbeat/module/gcp/compute/_meta/fields.yml similarity index 100% rename from x-pack/metricbeat/module/googlecloud/compute/_meta/fields.yml rename to x-pack/metricbeat/module/gcp/compute/_meta/fields.yml diff --git a/x-pack/metricbeat/module/googlecloud/compute/compute_integration_test.go b/x-pack/metricbeat/module/gcp/compute/compute_integration_test.go similarity index 66% rename from x-pack/metricbeat/module/googlecloud/compute/compute_integration_test.go rename to x-pack/metricbeat/module/gcp/compute/compute_integration_test.go index 99f76e47c20..74aade08442 100644 --- a/x-pack/metricbeat/module/googlecloud/compute/compute_integration_test.go +++ b/x-pack/metricbeat/module/gcp/compute/compute_integration_test.go @@ -3,7 +3,7 @@ // you may not use this file except in compliance with the Elastic License. // +build integration -// +build googlecloud +// +build gcp package compute @@ -11,10 +11,9 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" - "github.com/elastic/beats/v7/libbeat/common" mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func TestData(t *testing.T) { @@ -29,12 +28,12 @@ func TestData(t *testing.T) { metricPrefix string path string }{ - {"googlecloud.compute.instance", "./_meta/data.json"}, - {"googlecloud.compute.instance.disk", "./_meta/data_disk.json"}, - {"googlecloud.compute.instance.network", "./_meta/data_network.json"}, - {"googlecloud.compute.instance.cpu", "./_meta/data_cpu.json"}, - {"googlecloud.compute.firewall", "./_meta/data_firewall.json"}, - {"googlecloud.compute.instance.memory", "./_meta/data_memory.json"}, + {"gcp.compute.instance", "./_meta/data.json"}, + {"gcp.compute.instance.disk", "./_meta/data_disk.json"}, + {"gcp.compute.instance.network", "./_meta/data_network.json"}, + {"gcp.compute.instance.cpu", "./_meta/data_cpu.json"}, + {"gcp.compute.firewall", "./_meta/data_firewall.json"}, + {"gcp.compute.instance.memory", "./_meta/data_memory.json"}, } config := metrics.GetConfigForTest(t, "compute") diff --git a/x-pack/metricbeat/module/googlecloud/compute/compute_test.go b/x-pack/metricbeat/module/gcp/compute/compute_test.go similarity index 78% rename from x-pack/metricbeat/module/googlecloud/compute/compute_test.go rename to x-pack/metricbeat/module/gcp/compute/compute_test.go index 38519f6a51a..a2f6e59e56f 100644 --- a/x-pack/metricbeat/module/googlecloud/compute/compute_test.go +++ b/x-pack/metricbeat/module/gcp/compute/compute_test.go @@ -10,8 +10,8 @@ import ( "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/googlecloud/compute/manifest.yml b/x-pack/metricbeat/module/gcp/compute/manifest.yml similarity index 97% rename from x-pack/metricbeat/module/googlecloud/compute/manifest.yml rename to x-pack/metricbeat/module/gcp/compute/manifest.yml index 1c688a57e78..f5013e3a21c 100644 --- a/x-pack/metricbeat/module/googlecloud/compute/manifest.yml +++ b/x-pack/metricbeat/module/gcp/compute/manifest.yml @@ -1,6 +1,6 @@ default: true input: - module: googlecloud + module: gcp metricset: metrics defaults: metrics: diff --git a/x-pack/metricbeat/module/googlecloud/constants.go b/x-pack/metricbeat/module/gcp/constants.go similarity index 98% rename from x-pack/metricbeat/module/googlecloud/constants.go rename to x-pack/metricbeat/module/gcp/constants.go index 7840b3bffc4..0953684e693 100644 --- a/x-pack/metricbeat/module/googlecloud/constants.go +++ b/x-pack/metricbeat/module/gcp/constants.go @@ -2,13 +2,13 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. -package googlecloud +package gcp import monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" const ( // ModuleName in Metricbeat - ModuleName = "googlecloud" + ModuleName = "gcp" // MonitoringMetricsSamplingRate (in second) refers to how frequent monitoring collects measurement in GCP. MonitoringMetricsSamplingRate = 60 diff --git a/x-pack/metricbeat/module/gcp/fields.go b/x-pack/metricbeat/module/gcp/fields.go new file mode 100644 index 00000000000..604dfd40cdf --- /dev/null +++ b/x-pack/metricbeat/module/gcp/fields.go @@ -0,0 +1,23 @@ +// 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. + +// Code generated by beats/dev-tools/cmd/asset/asset.go - DO NOT EDIT. + +package gcp + +import ( + "github.com/elastic/beats/v7/libbeat/asset" +) + +func init() { + if err := asset.SetFields("metricbeat", "gcp", asset.ModuleFieldsPri, AssetGcp); err != nil { + panic(err) + } +} + +// AssetGcp returns asset data. +// This is the base64 encoded gzipped contents of module/gcp. +func AssetGcp() string { + return "eJzcXN1u2zgWvu9THMxNp4vUBXbvisUAHRc7E6DZDZBMbwWKOrY5oUiVP/GoT78gKcmSLMmyLSnNtFdJJPL7zv85lPQenjD/CFuavQEwzHD8CG9/k3LLEdZc2gTuOTEbqdK3bwAUciQaP0KMhrwBSFBTxTLDpPgIv7wBAPhtfQ+pTCzHNwAbhjzRH/0f3oMgKZZbuX8mz9zPStryN/Xr6/dwEiPX1a/LW2X8J1JT+3UHnvJfwCWYkYqJLaRoFKP6eOU2hDoMq1Gt/tH4Uy8U9y/8MgpXPGG+lyrpXDhFQxJiyFyLO6qzrK1zbTCdbOly2Z8qzOH/T6dV31g3kTb2Btjx1yglWcbEtrj0p8biAwZ0V1iM2REDCo1VAhPYKJlCw18+3d/CN4sqXx3RihnnTGxry7Ydqkmy7hpH6Bqb/hpWLnU90p6p1EEmnerr0nsLw1pq46/WwATlNkFQuLWcqBsw5K8bIMmfVpsUhbkBIhJQ0orECR+VkmrViYqJZ8koRqkUZncpslIgCjOpDPi1urfLlPS2wdrrjd7rPqwAt59BbsDssFR0uXuMXIqtBiO7IRhpCO/cfcMlaXtQY+9Hd2u1H0mlFebY8KhMM2twBsNbh5XPNDwmtCGCdttde/O+xeoLbpjCPeFtIQ4vOrRwffFEySzDJIpzgzqiXsTPhNs2/OaOTuU9FzTEeSuoTJ3y/PLlZhDn3pIGiB0DzAh9QjMjxGKD0SAr+8vsLJpRqFE9YxJRqVCPYHyUGHo5/9emMSrn0H7taiuQwnPeudBXuHuPOTexWsM4+07c6pMCfXQKUIS6n0pAhHNJicEE1vd/hIzFNFCrFArDc2DC1TIllXHwNdliZFiKk6L/wy0LG6kc5kLUTIBGKkWiew0qYfppJosiczn62q3nNBQc3e0UyoceMi1QMpsRkoMQEN3+D2SGytvpsfzrqPaKGVxGVm4rgwKMPC2sAGt+afl9Toircp5s0HEGYTQg/C73/jrvt1/vYEc0xIgClBWCie3NGOcRaPZSzeU/FNnzbMnyyIfCbsGPnEz6uXVgnCtfVijLfHkZTo3CLCNHtxPIZ1TnYVtMfuPwHRreVKp8FbssKMU8Zk7SSLPvY3LhWNIuj/tGoKjiHf/AxPl08PcVPO6YLoptl9Kl4DmQZ8I4iXnIo1/vih41dB0uZrqb8Z+wISnj+eokMasxmZDYXSBxqD7c+kty0nuSRUzM5EpOb0ca86mUiQLn1qI2wfeZ0SD3wmMCnRGKC/GXdq5Y0imAMmNXAS/IwMjZJVDNDCVJYsKJoPOMXL5IksCv5QZnNsA7Y7J2gu6PSleA6ANSBxO7KCuSSOE3p6RRZjK+ZHHmIapmqpZviMuLfkcdzOT3x8f7Dw9ecRA05wK+LPHpYyvvYzAP9gpt0QnGeQXN/bkLfj/klxY25QyF0U6+lwFfTMbnwtOZFHpcYzKVYMOWJ8y4kHj3CJD/a8WEQSV6BoGLhYUSEG4Vaj1CigMyHCdBL7TbL7+WznSQFfzsQv/j+h42XO41MPNWg8dymJdJASTLOKO+BQNtFJLUZ5B3bSNpURtTvV5GrlG2DtArpjWOXB9WJpbVQ4HMyAbkefRQcltSEZ38eqbyNIu05lGm5F/5j5KrKZfazzuFQD/y6596jg9u9VlntW4ot/aoEAyqlAk/T/RN2OP6/sPDwxfwkukPxaNDyGVY26b79a7mWlb7efUwwPHONQ3Cg/F9vRuHUOB+YV1ThWcrWmYoJoa5Dt1izZelNdoQf3rYgq6k3e58JO3B+7636PcPPxx74nynYNWpo421jWdoS+5t/GDjM9sRbeNqvcsi3YOtfnBUvAldFuEIfYpS1P64YSqXXNvUcmLYM4a0FRpVv4d2Gwq555hsQ7356fBzVY7eBAmECxLk7BlV7gEMNyVcbkN0maIEDUe9uUHQ7DuW1YMVDQIVrZ/J6mlFViWM6g/vgAkgDZUPxB+bRjXHKxUzbSCqIBeCRV8jNSG+1ZBZvQMUSSaZMDcQWwNCGsjRNFQ4TMaKapN5yMyqDskT13r5PQ4EIrKd4mzh0xbh58PxwbvSwMKmPcT6eJ1FK7OcR3W/r45UZo0ANT4VncNhTsPlFWrLzQr+IxUQSHDDBCsPXLtu1ViLxx8OAbkhkA+pTDztBEnCmcBe/qclN3VXfkpenYGxkNIw2mV17LZ81cpdQrFeSBdqVO8Wgqh3QIzBNOuGCH8Izp7Qc9E3PnD5e/wcSQFLM44pChPa00Si9tkjJobu/IOdVURewYMEJHRXiiTMo6kUhjDhOl1s3LDyTWd9M+XMIfTE/jk3ZzMuoW3ZM4rGvUCJ75uRKEgtNyzjCIalODDsbMjcVVqCskmS2GemjWKxLW3fUyplUG3kc0TKqJJlojjLYvzB4aL1ne+/4rzlskaW7uoSdzGbu6TMC5MOVxy9UBp7KAHcOzf+GyS1DokuEWKqbZvxEPbM7EBI8d7FnrwhYJacFy5bzJa1kxa/pYzj31Qm+MtFJjJWjtXMf1HzKIb+ZxmAYxxxNAbVskEwszFnehdaK4cCAgowMmP0LA692luEyH4nNUK5N+yJBpslft4Q53AnE7bJP9Gnz+UF13Two0PZPJyPyYzz2fF8lgirI1VyCnvR+ip0RRh6Hkt3wJ39bwnogja+n0sU55HC7dCjwi/F6gZiJZ/QldB7cSirCrQXTC6W5Nozw5iKZEuhMw/+uudMl9hjF+5J1TIRgwvVohEXqiARnwab1NGF4csmnmZHcRzAL0w/p0j+QEX+MedwbHEWX2fvEZV6ci7hzZO6FlIk2qrgMyHshGfqmA5PWxpZXgLfrDSk8TZK/2GzFBu2jUJ9Nd0BaZdewlY2EAK6I8KFgo1UYRLTjAI1HVRC8PuHdwxPqKXMQYuFub4jgWvi2+HVwYzRy47sHt2tVx7WvdpGTKNIFh9F+xbs1U5l5njAckhO87QJP1hpXbTff9Oa+hp2P3JReg2vSauC60qBWhHgU60vDQZOHl66Hrg285ce4tQ9z4FJM8L7fbzveEW8eyUlybnWXWUIQTK9k+2x7dgniIq7r6xIiqC46GCoZ2pSEDoZwF8ocA+jvjS6LfPQU9+w4KTIG/iW8LQTSC8Us7DpzM9inSvYOqJJ5Toa24WifG1J7dB6SUW2c3zT5SGsfOYzpCRjowP/8KsnY5qMse8DfEZuyEEDn+5vgRL/hEhN6s5P3V9SNDuZeBSl6H1rCVQm2J3ziDW771fyrj/7yqOYaEyi4oNVhFLU0xllSxrV9Kv4ppUzNO9TovhgFsTo+uytIsJl5IAGtOTIc0gsumKyuPLT+stA5eiIHYrUyfiEr4c4va6/1IrgdiAYPuUrRK0zpGzDaOSwptZMOxBoSb4ccKUkqQuxxNAhzeGPN1xucmd9sOFivq3PNbRf5b/WG+GSryZcSabzmwRThZXj4H6dlgsbn+xtSF/r1N7N8MtryFBBbOkTmoYgCjZAOdFlO+pBgH/tu+hXpaDoV0hIHr4W5wRYXacwC2+mEFPMhEma+a+e+RcnnwkvXwWR1vhbEzLwzor/1IK3k6ioj1+11R/oTFd1l2Us4bzScPHZhh9Myf8PAAD//7kI98I=" +} diff --git a/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/data.json b/x-pack/metricbeat/module/gcp/loadbalancing/_meta/data.json similarity index 89% rename from x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/data.json rename to x-pack/metricbeat/module/gcp/loadbalancing/_meta/data.json index 97a9192732a..6b397af65d3 100644 --- a/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/data.json +++ b/x-pack/metricbeat/module/gcp/loadbalancing/_meta/data.json @@ -4,14 +4,14 @@ "account": { "id": "elastic-observability" }, - "provider": "googlecloud" + "provider": "gcp" }, "event": { - "dataset": "googlecloud.loadbalancing", + "dataset": "gcp.loadbalancing", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": { "metrics": { "client_network": "ocp-be-c5kjr-network", @@ -47,6 +47,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } } diff --git a/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/data_l3.json b/x-pack/metricbeat/module/gcp/loadbalancing/_meta/data_l3.json similarity index 89% rename from x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/data_l3.json rename to x-pack/metricbeat/module/gcp/loadbalancing/_meta/data_l3.json index 9a58a5ebc5b..d462c047e7c 100644 --- a/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/data_l3.json +++ b/x-pack/metricbeat/module/gcp/loadbalancing/_meta/data_l3.json @@ -4,14 +4,14 @@ "account": { "id": "elastic-observability" }, - "provider": "googlecloud" + "provider": "gcp" }, "event": { - "dataset": "googlecloud.loadbalancing", + "dataset": "gcp.loadbalancing", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": { "metrics": { "client_network": "UNKNOWN", @@ -45,6 +45,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } -} \ No newline at end of file +} diff --git a/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/docs.asciidoc b/x-pack/metricbeat/module/gcp/loadbalancing/_meta/docs.asciidoc similarity index 100% rename from x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/docs.asciidoc rename to x-pack/metricbeat/module/gcp/loadbalancing/_meta/docs.asciidoc diff --git a/x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/fields.yml b/x-pack/metricbeat/module/gcp/loadbalancing/_meta/fields.yml similarity index 100% rename from x-pack/metricbeat/module/googlecloud/loadbalancing/_meta/fields.yml rename to x-pack/metricbeat/module/gcp/loadbalancing/_meta/fields.yml diff --git a/x-pack/metricbeat/module/googlecloud/loadbalancing/loadbalancing_integration_test.go b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go similarity index 73% rename from x-pack/metricbeat/module/googlecloud/loadbalancing/loadbalancing_integration_test.go rename to x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go index e95dede2a29..1389338f92c 100644 --- a/x-pack/metricbeat/module/googlecloud/loadbalancing/loadbalancing_integration_test.go +++ b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go @@ -3,7 +3,7 @@ // you may not use this file except in compliance with the Elastic License. // +build integration -// +build googlecloud +// +build gcp package loadbalancing @@ -11,10 +11,9 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" - "github.com/elastic/beats/v7/libbeat/common" mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func TestData(t *testing.T) { @@ -29,10 +28,10 @@ func TestData(t *testing.T) { metricPrefix string path string }{ - {"googlecloud.loadbalancing", "./_meta/data.json"}, - {"googlecloud.loadbalancing.https", "./_meta/data_https.json"}, - {"googlecloud.loadbalancing.l3", "./_meta/data_l3.json"}, - {"googlecloud.loadbalancing.tcp_ssl_proxy", "./_meta/data_tcp_ssl_proxy.json"}, + {"gcp.loadbalancing", "./_meta/data.json"}, + {"gcp.loadbalancing.https", "./_meta/data_https.json"}, + {"gcp.loadbalancing.l3", "./_meta/data_l3.json"}, + {"gcp.loadbalancing.tcp_ssl_proxy", "./_meta/data_tcp_ssl_proxy.json"}, } config := metrics.GetConfigForTest(t, "loadbalancing") diff --git a/x-pack/metricbeat/module/googlecloud/loadbalancing/loadbalancing_test.go b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_test.go similarity index 78% rename from x-pack/metricbeat/module/googlecloud/loadbalancing/loadbalancing_test.go rename to x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_test.go index 5f7ee66969d..9769d841bef 100644 --- a/x-pack/metricbeat/module/googlecloud/loadbalancing/loadbalancing_test.go +++ b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_test.go @@ -10,8 +10,8 @@ import ( "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/googlecloud/loadbalancing/manifest.yml b/x-pack/metricbeat/module/gcp/loadbalancing/manifest.yml similarity index 97% rename from x-pack/metricbeat/module/googlecloud/loadbalancing/manifest.yml rename to x-pack/metricbeat/module/gcp/loadbalancing/manifest.yml index 20a41824fe3..f20f7ebd1b0 100644 --- a/x-pack/metricbeat/module/googlecloud/loadbalancing/manifest.yml +++ b/x-pack/metricbeat/module/gcp/loadbalancing/manifest.yml @@ -1,6 +1,6 @@ default: false input: - module: googlecloud + module: gcp metricset: metrics defaults: metrics: diff --git a/x-pack/metricbeat/module/googlecloud/metadata.go b/x-pack/metricbeat/module/gcp/metadata.go similarity index 99% rename from x-pack/metricbeat/module/googlecloud/metadata.go rename to x-pack/metricbeat/module/gcp/metadata.go index 005ed4aab5c..ae962ea51c8 100644 --- a/x-pack/metricbeat/module/googlecloud/metadata.go +++ b/x-pack/metricbeat/module/gcp/metadata.go @@ -2,7 +2,7 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. -package googlecloud +package gcp import ( "context" diff --git a/x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json b/x-pack/metricbeat/module/gcp/metrics/_meta/data.json similarity index 64% rename from x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json rename to x-pack/metricbeat/module/gcp/metrics/_meta/data.json index 43fb0505dc3..63de88f4828 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/_meta/data.json +++ b/x-pack/metricbeat/module/gcp/metrics/_meta/data.json @@ -6,8 +6,8 @@ "name": "elastic-observability" }, "instance": { - "id": "2029454349697438698", - "name": "nchaulet-loadtest-elasticsearch" + "id": "4049989596327614796", + "name": "nchaulet-loadtest-horde-master" }, "machine": { "type": "n1-standard-8" @@ -17,29 +17,29 @@ "cloud.availability_zone": "us-central1-a", "cloud.region": "us-central1", "event": { - "dataset": "googlecloud.metrics", + "dataset": "gcp.metrics", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": {}, "metrics": { "instance": { - "uptime": { - "value": 60.00000000093132 + "uptime_total": { + "value": 791820 } } } }, "host": { - "id": "2029454349697438698", - "name": "nchaulet-loadtest-elasticsearch" + "id": "4049989596327614796", + "name": "nchaulet-loadtest-horde-master" }, "metricset": { "name": "metrics", "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } } \ No newline at end of file diff --git a/x-pack/metricbeat/module/googlecloud/metrics/_meta/docs.asciidoc b/x-pack/metricbeat/module/gcp/metrics/_meta/docs.asciidoc similarity index 100% rename from x-pack/metricbeat/module/googlecloud/metrics/_meta/docs.asciidoc rename to x-pack/metricbeat/module/gcp/metrics/_meta/docs.asciidoc diff --git a/x-pack/metricbeat/module/googlecloud/metrics/_meta/fields.yml b/x-pack/metricbeat/module/gcp/metrics/_meta/fields.yml similarity index 100% rename from x-pack/metricbeat/module/googlecloud/metrics/_meta/fields.yml rename to x-pack/metricbeat/module/gcp/metrics/_meta/fields.yml diff --git a/x-pack/metricbeat/module/googlecloud/metrics/compute/identity.go b/x-pack/metricbeat/module/gcp/metrics/compute/identity.go similarity index 83% rename from x-pack/metricbeat/module/googlecloud/metrics/compute/identity.go rename to x-pack/metricbeat/module/gcp/metrics/compute/identity.go index 19e434e8df7..700272f1e1e 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/compute/identity.go +++ b/x-pack/metricbeat/module/gcp/metrics/compute/identity.go @@ -8,12 +8,12 @@ import ( "context" "errors" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" ) // ID returns a generated ID for a Compute resource based on its labels, projectID, zone, timestamp and instance ID // It's purpose is to group metrics that share that ID (the ones on the same instance, basically) -func (s *metadataCollector) ID(ctx context.Context, in *googlecloud.MetadataCollectorInputData) (string, error) { +func (s *metadataCollector) ID(ctx context.Context, in *gcp.MetadataCollectorInputData) (string, error) { metadata, err := s.Metadata(ctx, in.TimeSeries) if err != nil { return "", err diff --git a/x-pack/metricbeat/module/googlecloud/metrics/compute/metadata.go b/x-pack/metricbeat/module/gcp/metrics/compute/metadata.go similarity index 79% rename from x-pack/metricbeat/module/googlecloud/metrics/compute/metadata.go rename to x-pack/metricbeat/module/gcp/metrics/compute/metadata.go index 67584bc002c..d7bc006c77e 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/compute/metadata.go +++ b/x-pack/metricbeat/module/gcp/metrics/compute/metadata.go @@ -16,11 +16,11 @@ import ( "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" ) // NewMetadataService returns the specific Metadata service for a GCP Compute resource -func NewMetadataService(projectID, zone string, region string, opt ...option.ClientOption) (googlecloud.MetadataService, error) { +func NewMetadataService(projectID, zone string, region string, opt ...option.ClientOption) (gcp.MetadataService, error) { return &metadataCollector{ projectID: projectID, zone: zone, @@ -60,38 +60,38 @@ type metadataCollector struct { } // Metadata implements googlecloud.MetadataCollector to the known set of labels from a Compute TimeSeries single point of data. -func (s *metadataCollector) Metadata(ctx context.Context, resp *monitoringpb.TimeSeries) (googlecloud.MetadataCollectorData, error) { +func (s *metadataCollector) Metadata(ctx context.Context, resp *monitoringpb.TimeSeries) (gcp.MetadataCollectorData, error) { if s.computeMetadata == nil { _, err := s.instanceMetadata(ctx, s.instanceID(resp), s.instanceZone(resp)) if err != nil { - return googlecloud.MetadataCollectorData{}, err + return gcp.MetadataCollectorData{}, err } } - stackdriverLabels := googlecloud.NewStackdriverMetadataServiceForTimeSeries(resp) + stackdriverLabels := gcp.NewStackdriverMetadataServiceForTimeSeries(resp) metadataCollectorData, err := stackdriverLabels.Metadata(ctx, resp) if err != nil { - return googlecloud.MetadataCollectorData{}, err + return gcp.MetadataCollectorData{}, err } if resp.Resource != nil && resp.Resource.Labels != nil { - metadataCollectorData.ECS.Put(googlecloud.ECSCloudInstanceIDKey, resp.Resource.Labels[googlecloud.TimeSeriesResponsePathForECSInstanceID]) + metadataCollectorData.ECS.Put(gcp.ECSCloudInstanceIDKey, resp.Resource.Labels[gcp.TimeSeriesResponsePathForECSInstanceID]) } if resp.Metric.Labels != nil { - metadataCollectorData.ECS.Put(googlecloud.ECSCloudInstanceNameKey, resp.Metric.Labels[googlecloud.TimeSeriesResponsePathForECSInstanceName]) + metadataCollectorData.ECS.Put(gcp.ECSCloudInstanceNameKey, resp.Metric.Labels[gcp.TimeSeriesResponsePathForECSInstanceName]) } if s.computeMetadata.machineType != "" { lastIndex := strings.LastIndex(s.computeMetadata.machineType, "/") - metadataCollectorData.ECS.Put(googlecloud.ECSCloudMachineTypeKey, s.computeMetadata.machineType[lastIndex+1:]) + metadataCollectorData.ECS.Put(gcp.ECSCloudMachineTypeKey, s.computeMetadata.machineType[lastIndex+1:]) } - s.computeMetadata.Metrics = metadataCollectorData.Labels[googlecloud.LabelMetrics] - s.computeMetadata.System = metadataCollectorData.Labels[googlecloud.LabelSystem] + s.computeMetadata.Metrics = metadataCollectorData.Labels[gcp.LabelMetrics] + s.computeMetadata.System = metadataCollectorData.Labels[gcp.LabelSystem] if s.computeMetadata.User != nil { - metadataCollectorData.Labels[googlecloud.LabelUser] = s.computeMetadata.User + metadataCollectorData.Labels[gcp.LabelUser] = s.computeMetadata.User } /* @@ -168,7 +168,7 @@ func (s *metadataCollector) instance(ctx context.Context, instanceID, zone strin func (s *metadataCollector) instanceID(ts *monitoringpb.TimeSeries) string { if ts.Resource != nil && ts.Resource.Labels != nil { - return ts.Resource.Labels[googlecloud.TimeSeriesResponsePathForECSInstanceID] + return ts.Resource.Labels[gcp.TimeSeriesResponsePathForECSInstanceID] } return "" @@ -176,7 +176,7 @@ func (s *metadataCollector) instanceID(ts *monitoringpb.TimeSeries) string { func (s *metadataCollector) instanceZone(ts *monitoringpb.TimeSeries) string { if ts.Resource != nil && ts.Resource.Labels != nil { - return ts.Resource.Labels[googlecloud.TimeSeriesResponsePathForECSAvailabilityZone] + return ts.Resource.Labels[gcp.TimeSeriesResponsePathForECSAvailabilityZone] } return "" diff --git a/x-pack/metricbeat/module/googlecloud/metrics/compute/metadata_test.go b/x-pack/metricbeat/module/gcp/metrics/compute/metadata_test.go similarity index 100% rename from x-pack/metricbeat/module/googlecloud/metrics/compute/metadata_test.go rename to x-pack/metricbeat/module/gcp/metrics/compute/metadata_test.go diff --git a/x-pack/metricbeat/module/googlecloud/metrics/integration.go b/x-pack/metricbeat/module/gcp/metrics/integration.go similarity index 97% rename from x-pack/metricbeat/module/googlecloud/metrics/integration.go rename to x-pack/metricbeat/module/gcp/metrics/integration.go index cfb8b38a828..60bac9b4dd2 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/integration.go +++ b/x-pack/metricbeat/module/gcp/metrics/integration.go @@ -24,7 +24,7 @@ func GetConfigForTest(t *testing.T, metricSetName string) map[string]interface{} t.Fatal("$GCP_CREDENTIALS_FILE_PATH not set or set to empty") } else { config = map[string]interface{}{ - "module": "googlecloud", + "module": "gcp", "period": "1m", "metricsets": []string{metricSetName}, "project_id": projectID, diff --git a/x-pack/metricbeat/module/googlecloud/metrics/metadata_services.go b/x-pack/metricbeat/module/gcp/metrics/metadata_services.go similarity index 74% rename from x-pack/metricbeat/module/googlecloud/metrics/metadata_services.go rename to x-pack/metricbeat/module/gcp/metrics/metadata_services.go index 717faed4854..5bbca0dac10 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/metadata_services.go +++ b/x-pack/metricbeat/module/gcp/metrics/metadata_services.go @@ -5,15 +5,15 @@ package metrics import ( - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics/compute" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics/compute" ) // NewMetadataServiceForConfig returns a service to fetch metadata from a config struct. It must return the Compute // abstraction to fetch metadata, the pubsub abstraction, etc. -func NewMetadataServiceForConfig(c config, serviceName string) (googlecloud.MetadataService, error) { +func NewMetadataServiceForConfig(c config, serviceName string) (gcp.MetadataService, error) { switch serviceName { - case googlecloud.ServiceCompute: + case gcp.ServiceCompute: return compute.NewMetadataService(c.ProjectID, c.Zone, c.Region, c.opt...) default: return nil, nil diff --git a/x-pack/metricbeat/module/googlecloud/metrics/metrics_integration_test.go b/x-pack/metricbeat/module/gcp/metrics/metrics_integration_test.go similarity index 95% rename from x-pack/metricbeat/module/googlecloud/metrics/metrics_integration_test.go rename to x-pack/metricbeat/module/gcp/metrics/metrics_integration_test.go index c73c3dbb023..f9d9aece45d 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/metrics_integration_test.go +++ b/x-pack/metricbeat/module/gcp/metrics/metrics_integration_test.go @@ -3,7 +3,7 @@ // you may not use this file except in compliance with the Elastic License. // +build integration -// +build googlecloud +// +build gcp package metrics diff --git a/x-pack/metricbeat/module/googlecloud/metrics/metrics_requester.go b/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go similarity index 95% rename from x-pack/metricbeat/module/googlecloud/metrics/metrics_requester.go rename to x-pack/metricbeat/module/gcp/metrics/metrics_requester.go index a8be20ab2f5..1154819d198 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/metrics_requester.go +++ b/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go @@ -20,7 +20,7 @@ import ( monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" "github.com/elastic/beats/v7/libbeat/logp" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" ) type metricsRequester struct { @@ -45,7 +45,7 @@ func (r *metricsRequester) Metric(ctx context.Context, metricType string, timeIn View: monitoringpb.ListTimeSeriesRequest_FULL, Filter: r.getFilterForMetric(metricType), Aggregation: &monitoringpb.Aggregation{ - PerSeriesAligner: googlecloud.AlignersMapToGCP[aligner], + PerSeriesAligner: gcp.AlignersMapToGCP[aligner], AlignmentPeriod: r.config.period, }, } @@ -109,9 +109,9 @@ func (r *metricsRequester) getFilterForMetric(m string) (f string) { service := serviceRegexp.ReplaceAllString(m, "${service}") switch service { - case googlecloud.ServicePubsub, googlecloud.ServiceLoadBalancing: + case gcp.ServicePubsub, gcp.ServiceLoadBalancing: return - case googlecloud.ServiceStorage: + case gcp.ServiceStorage: if r.config.Region == "" { return } @@ -174,7 +174,7 @@ func getTimeIntervalAligner(ingestDelay time.Duration, samplePeriod time.Duratio } // Default aligner for aggregation is ALIGN_NONE if it's not given - updatedAligner := googlecloud.DefaultAligner + updatedAligner := gcp.DefaultAligner if needsAggregation && inputAligner != "" { updatedAligner = inputAligner } diff --git a/x-pack/metricbeat/module/googlecloud/metrics/metrics_requester_test.go b/x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go similarity index 100% rename from x-pack/metricbeat/module/googlecloud/metrics/metrics_requester_test.go rename to x-pack/metricbeat/module/gcp/metrics/metrics_requester_test.go diff --git a/x-pack/metricbeat/module/googlecloud/metrics/metricset.go b/x-pack/metricbeat/module/gcp/metrics/metricset.go similarity index 95% rename from x-pack/metricbeat/module/googlecloud/metrics/metricset.go rename to x-pack/metricbeat/module/gcp/metrics/metricset.go index b0823feeace..13f1fbb654e 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/metricset.go +++ b/x-pack/metricbeat/module/gcp/metrics/metricset.go @@ -9,8 +9,6 @@ import ( "fmt" "time" - "github.com/elastic/beats/v7/libbeat/logp" - monitoring "cloud.google.com/go/monitoring/apiv3" "github.com/golang/protobuf/ptypes/duration" "github.com/pkg/errors" @@ -21,8 +19,9 @@ import ( "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/beats/v7/libbeat/common/cfgwarn" + "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/beats/v7/metricbeat/mb" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" ) const ( @@ -35,7 +34,7 @@ const ( // the MetricSet for each host defined in the module's configuration. After the // MetricSet has been created then Fetch will begin to be called periodically. func init() { - mb.Registry.MustAddMetricSet(googlecloud.ModuleName, MetricsetName, New) + mb.Registry.MustAddMetricSet(gcp.ModuleName, MetricsetName, New) } // MetricSet holds any configuration or state information. It must implement @@ -154,7 +153,7 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) (err erro func (m *MetricSet) eventMapping(ctx context.Context, tss []timeSeriesWithAligner, serviceName string) ([]mb.Event, error) { e := newIncomingFieldExtractor(m.Logger()) - var gcpService = googlecloud.NewStackdriverMetadataServiceForTimeSeries(nil) + var gcpService = gcp.NewStackdriverMetadataServiceForTimeSeries(nil) var err error if !m.config.ExcludeLabels { @@ -197,8 +196,8 @@ func (m *MetricSet) eventMapping(ctx context.Context, tss []timeSeriesWithAligne // validatePeriodForGCP returns nil if the Period in the module config is in the accepted threshold func validatePeriodForGCP(d time.Duration) (err error) { - if d.Seconds() < googlecloud.MonitoringMetricsSamplingRate { - return errors.Errorf("period in Google Cloud config file cannot be set to less than %d seconds", googlecloud.MonitoringMetricsSamplingRate) + if d.Seconds() < gcp.MonitoringMetricsSamplingRate { + return errors.Errorf("period in Google Cloud config file cannot be set to less than %d seconds", gcp.MonitoringMetricsSamplingRate) } return nil @@ -207,12 +206,12 @@ func validatePeriodForGCP(d time.Duration) (err error) { // Validate metrics related config func (mc *metricsConfig) Validate() error { gcpAlignerNames := make([]string, 0) - for k := range googlecloud.AlignersMapToGCP { + for k := range gcp.AlignersMapToGCP { gcpAlignerNames = append(gcpAlignerNames, k) } if mc.Aligner != "" { - if _, ok := googlecloud.AlignersMapToGCP[mc.Aligner]; !ok { + if _, ok := gcp.AlignersMapToGCP[mc.Aligner]; !ok { return errors.Errorf("the given aligner is not supported, please specify one of %s as aligner", gcpAlignerNames) } } diff --git a/x-pack/metricbeat/module/googlecloud/metrics/response_parser.go b/x-pack/metricbeat/module/gcp/metrics/response_parser.go similarity index 95% rename from x-pack/metricbeat/module/googlecloud/metrics/response_parser.go rename to x-pack/metricbeat/module/gcp/metrics/response_parser.go index 3ab2ba9018a..01817361bf7 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/response_parser.go +++ b/x-pack/metricbeat/module/gcp/metrics/response_parser.go @@ -9,14 +9,13 @@ import ( "strings" "time" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" - "github.com/golang/protobuf/ptypes" "github.com/pkg/errors" "google.golang.org/genproto/googleapis/monitoring/v3" "github.com/elastic/beats/v7/libbeat/common" "github.com/elastic/beats/v7/libbeat/logp" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" ) func newIncomingFieldExtractor(l *logp.Logger) *incomingFieldExtractor { @@ -84,7 +83,7 @@ func cleanMetricNameString(s string, aligner string) string { removedPrefix := strings.TrimPrefix(s, prefix) replacedChars := strings.Replace(removedPrefix, "/", ".", -1) - metricName := replacedChars + googlecloud.AlignersMapToSuffix[aligner] + metricName := replacedChars + gcp.AlignersMapToSuffix[aligner] return metricName } diff --git a/x-pack/metricbeat/module/googlecloud/metrics/response_parser_test.go b/x-pack/metricbeat/module/gcp/metrics/response_parser_test.go similarity index 100% rename from x-pack/metricbeat/module/googlecloud/metrics/response_parser_test.go rename to x-pack/metricbeat/module/gcp/metrics/response_parser_test.go diff --git a/x-pack/metricbeat/module/googlecloud/metrics/timeseries.go b/x-pack/metricbeat/module/gcp/metrics/timeseries.go similarity index 80% rename from x-pack/metricbeat/module/googlecloud/metrics/timeseries.go rename to x-pack/metricbeat/module/gcp/metrics/timeseries.go index f96b8fcb767..a0e140dc13c 100644 --- a/x-pack/metricbeat/module/googlecloud/metrics/timeseries.go +++ b/x-pack/metricbeat/module/gcp/metrics/timeseries.go @@ -7,12 +7,12 @@ package metrics import ( "context" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" ) //timeSeriesGrouped groups TimeSeries responses into common Elasticsearch friendly events. This is to avoid sending // events with a single metric that shares info (like timestamp) with another event with a single metric too -func (m *MetricSet) timeSeriesGrouped(ctx context.Context, gcpService googlecloud.MetadataService, tsas []timeSeriesWithAligner, e *incomingFieldExtractor) (map[string][]KeyValuePoint, error) { +func (m *MetricSet) timeSeriesGrouped(ctx context.Context, gcpService gcp.MetadataService, tsas []timeSeriesWithAligner, e *incomingFieldExtractor) (map[string][]KeyValuePoint, error) { eventGroups := make(map[string][]KeyValuePoint) metadataService := gcpService @@ -25,9 +25,9 @@ func (m *MetricSet) timeSeriesGrouped(ctx context.Context, gcpService googleclou return nil, err } - sdCollectorInputData := googlecloud.NewStackdriverCollectorInputData(ts, m.config.ProjectID, m.config.Zone, m.config.Region) + sdCollectorInputData := gcp.NewStackdriverCollectorInputData(ts, m.config.ProjectID, m.config.Zone, m.config.Region) if gcpService == nil { - metadataService = googlecloud.NewStackdriverMetadataServiceForTimeSeries(ts) + metadataService = gcp.NewStackdriverMetadataServiceForTimeSeries(ts) } for i := range keyValues { diff --git a/x-pack/metricbeat/module/googlecloud/module.yml b/x-pack/metricbeat/module/gcp/module.yml similarity index 78% rename from x-pack/metricbeat/module/googlecloud/module.yml rename to x-pack/metricbeat/module/gcp/module.yml index c3509711a9a..854a4af7154 100644 --- a/x-pack/metricbeat/module/googlecloud/module.yml +++ b/x-pack/metricbeat/module/gcp/module.yml @@ -1,4 +1,4 @@ -name: googlecloud +name: gcp metricsets: - compute - pubsub diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/data.json b/x-pack/metricbeat/module/gcp/pubsub/_meta/data.json similarity index 78% rename from x-pack/metricbeat/module/googlecloud/pubsub/_meta/data.json rename to x-pack/metricbeat/module/gcp/pubsub/_meta/data.json index c1a0365401d..2731637a2e5 100644 --- a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/data.json +++ b/x-pack/metricbeat/module/gcp/pubsub/_meta/data.json @@ -4,14 +4,14 @@ "account": { "id": "elastic-observability" }, - "provider": "googlecloud" + "provider": "gcp" }, "event": { - "dataset": "googlecloud.pubsub", + "dataset": "gcp.pubsub", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": { "resource": { "subscription_id": "test-subscription-1" @@ -30,6 +30,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } -} \ No newline at end of file +} diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/data_subscription.json b/x-pack/metricbeat/module/gcp/pubsub/_meta/data_subscription.json similarity index 78% rename from x-pack/metricbeat/module/googlecloud/pubsub/_meta/data_subscription.json rename to x-pack/metricbeat/module/gcp/pubsub/_meta/data_subscription.json index 13c2724143f..397a61ea926 100644 --- a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/data_subscription.json +++ b/x-pack/metricbeat/module/gcp/pubsub/_meta/data_subscription.json @@ -4,14 +4,14 @@ "account": { "id": "elastic-observability" }, - "provider": "googlecloud" + "provider": "gcp" }, "event": { - "dataset": "googlecloud.pubsub", + "dataset": "gcp.pubsub", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": { "resource": { "subscription_id": "test-ks" @@ -30,6 +30,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } -} \ No newline at end of file +} diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/data_topic.json b/x-pack/metricbeat/module/gcp/pubsub/_meta/data_topic.json similarity index 84% rename from x-pack/metricbeat/module/googlecloud/pubsub/_meta/data_topic.json rename to x-pack/metricbeat/module/gcp/pubsub/_meta/data_topic.json index 7f296406136..1453f9f379c 100644 --- a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/data_topic.json +++ b/x-pack/metricbeat/module/gcp/pubsub/_meta/data_topic.json @@ -4,14 +4,14 @@ "account": { "id": "elastic-observability" }, - "provider": "googlecloud" + "provider": "gcp" }, "event": { - "dataset": "googlecloud.pubsub", + "dataset": "gcp.pubsub", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": { "resource": { "topic_id": "test-ks" @@ -38,6 +38,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } -} \ No newline at end of file +} diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/docs.asciidoc b/x-pack/metricbeat/module/gcp/pubsub/_meta/docs.asciidoc similarity index 100% rename from x-pack/metricbeat/module/googlecloud/pubsub/_meta/docs.asciidoc rename to x-pack/metricbeat/module/gcp/pubsub/_meta/docs.asciidoc diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/_meta/fields.yml b/x-pack/metricbeat/module/gcp/pubsub/_meta/fields.yml similarity index 100% rename from x-pack/metricbeat/module/googlecloud/pubsub/_meta/fields.yml rename to x-pack/metricbeat/module/gcp/pubsub/_meta/fields.yml diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/manifest.yml b/x-pack/metricbeat/module/gcp/pubsub/manifest.yml similarity index 99% rename from x-pack/metricbeat/module/googlecloud/pubsub/manifest.yml rename to x-pack/metricbeat/module/gcp/pubsub/manifest.yml index 7cabb2f2085..12deb4910be 100644 --- a/x-pack/metricbeat/module/googlecloud/pubsub/manifest.yml +++ b/x-pack/metricbeat/module/gcp/pubsub/manifest.yml @@ -1,6 +1,6 @@ default: true input: - module: googlecloud + module: gcp metricset: metrics defaults: metrics: diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/pubsub_integration_test.go b/x-pack/metricbeat/module/gcp/pubsub/pubsub_integration_test.go similarity index 74% rename from x-pack/metricbeat/module/googlecloud/pubsub/pubsub_integration_test.go rename to x-pack/metricbeat/module/gcp/pubsub/pubsub_integration_test.go index e391f22b8f8..8c47c45a0ad 100644 --- a/x-pack/metricbeat/module/googlecloud/pubsub/pubsub_integration_test.go +++ b/x-pack/metricbeat/module/gcp/pubsub/pubsub_integration_test.go @@ -3,7 +3,7 @@ // you may not use this file except in compliance with the Elastic License. // +build integration -// +build googlecloud +// +build gcp package pubsub @@ -11,10 +11,9 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" - "github.com/elastic/beats/v7/libbeat/common" mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func TestData(t *testing.T) { @@ -29,10 +28,10 @@ func TestData(t *testing.T) { metricPrefix string path string }{ - {"googlecloud.pubsub", "./_meta/data.json"}, - {"googlecloud.pubsub.snapshot", "./_meta/data_snapshot.json"}, - {"googlecloud.pubsub.subscription", "./_meta/data_subscription.json"}, - {"googlecloud.pubsub.topic", "./_meta/data_topic.json"}, + {"gcp.pubsub", "./_meta/data.json"}, + {"gcp.pubsub.snapshot", "./_meta/data_snapshot.json"}, + {"gcp.pubsub.subscription", "./_meta/data_subscription.json"}, + {"gcp.pubsub.topic", "./_meta/data_topic.json"}, } config := metrics.GetConfigForTest(t, "pubsub") diff --git a/x-pack/metricbeat/module/googlecloud/pubsub/pubsub_test.go b/x-pack/metricbeat/module/gcp/pubsub/pubsub_test.go similarity index 78% rename from x-pack/metricbeat/module/googlecloud/pubsub/pubsub_test.go rename to x-pack/metricbeat/module/gcp/pubsub/pubsub_test.go index 84dc87cdf6c..6d3ba5c7fa3 100644 --- a/x-pack/metricbeat/module/googlecloud/pubsub/pubsub_test.go +++ b/x-pack/metricbeat/module/gcp/pubsub/pubsub_test.go @@ -10,8 +10,8 @@ import ( "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/googlecloud/storage/_meta/data.json b/x-pack/metricbeat/module/gcp/storage/_meta/data.json similarity index 81% rename from x-pack/metricbeat/module/googlecloud/storage/_meta/data.json rename to x-pack/metricbeat/module/gcp/storage/_meta/data.json index 679102209b2..a56918eda34 100644 --- a/x-pack/metricbeat/module/googlecloud/storage/_meta/data.json +++ b/x-pack/metricbeat/module/gcp/storage/_meta/data.json @@ -4,14 +4,14 @@ "account": { "id": "elastic-apm" }, - "provider": "googlecloud" + "provider": "gcp" }, "event": { - "dataset": "googlecloud.storage", + "dataset": "gcp.storage", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": { "metrics": { "storage_class": "MULTI_REGIONAL" @@ -34,6 +34,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } -} \ No newline at end of file +} diff --git a/x-pack/metricbeat/module/googlecloud/storage/_meta/data_network.json b/x-pack/metricbeat/module/gcp/storage/_meta/data_network.json similarity index 82% rename from x-pack/metricbeat/module/googlecloud/storage/_meta/data_network.json rename to x-pack/metricbeat/module/gcp/storage/_meta/data_network.json index 7bb1c6a4c86..e857ebc4bec 100644 --- a/x-pack/metricbeat/module/googlecloud/storage/_meta/data_network.json +++ b/x-pack/metricbeat/module/gcp/storage/_meta/data_network.json @@ -4,14 +4,14 @@ "account": { "id": "elastic-observability" }, - "provider": "googlecloud" + "provider": "gcp" }, "event": { - "dataset": "googlecloud.storage", + "dataset": "gcp.storage", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": { "metrics": { "method": "GetBucketMetadata", @@ -33,6 +33,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } -} \ No newline at end of file +} diff --git a/x-pack/metricbeat/module/googlecloud/storage/_meta/data_storage.json b/x-pack/metricbeat/module/gcp/storage/_meta/data_storage.json similarity index 82% rename from x-pack/metricbeat/module/googlecloud/storage/_meta/data_storage.json rename to x-pack/metricbeat/module/gcp/storage/_meta/data_storage.json index f98a6a6f744..bd1192400ee 100644 --- a/x-pack/metricbeat/module/googlecloud/storage/_meta/data_storage.json +++ b/x-pack/metricbeat/module/gcp/storage/_meta/data_storage.json @@ -4,14 +4,14 @@ "account": { "id": "elastic-observability" }, - "provider": "googlecloud" + "provider": "gcp" }, "event": { - "dataset": "googlecloud.storage", + "dataset": "gcp.storage", "duration": 115000, - "module": "googlecloud" + "module": "gcp" }, - "googlecloud": { + "gcp": { "labels": { "metrics": { "storage_class": "MULTI_REGIONAL" @@ -34,6 +34,6 @@ "period": 10000 }, "service": { - "type": "googlecloud" + "type": "gcp" } -} \ No newline at end of file +} diff --git a/x-pack/metricbeat/module/googlecloud/storage/_meta/docs.asciidoc b/x-pack/metricbeat/module/gcp/storage/_meta/docs.asciidoc similarity index 100% rename from x-pack/metricbeat/module/googlecloud/storage/_meta/docs.asciidoc rename to x-pack/metricbeat/module/gcp/storage/_meta/docs.asciidoc diff --git a/x-pack/metricbeat/module/googlecloud/storage/_meta/fields.yml b/x-pack/metricbeat/module/gcp/storage/_meta/fields.yml similarity index 100% rename from x-pack/metricbeat/module/googlecloud/storage/_meta/fields.yml rename to x-pack/metricbeat/module/gcp/storage/_meta/fields.yml diff --git a/x-pack/metricbeat/module/googlecloud/storage/manifest.yml b/x-pack/metricbeat/module/gcp/storage/manifest.yml similarity index 95% rename from x-pack/metricbeat/module/googlecloud/storage/manifest.yml rename to x-pack/metricbeat/module/gcp/storage/manifest.yml index 26d3d4f5e5f..efa0064c7dd 100644 --- a/x-pack/metricbeat/module/googlecloud/storage/manifest.yml +++ b/x-pack/metricbeat/module/gcp/storage/manifest.yml @@ -1,6 +1,6 @@ default: false input: - module: googlecloud + module: gcp metricset: metrics defaults: metrics: diff --git a/x-pack/metricbeat/module/googlecloud/storage/storage_integration_test.go b/x-pack/metricbeat/module/gcp/storage/storage_integration_test.go similarity index 74% rename from x-pack/metricbeat/module/googlecloud/storage/storage_integration_test.go rename to x-pack/metricbeat/module/gcp/storage/storage_integration_test.go index 035df4fdd61..34c6a37886c 100644 --- a/x-pack/metricbeat/module/googlecloud/storage/storage_integration_test.go +++ b/x-pack/metricbeat/module/gcp/storage/storage_integration_test.go @@ -3,7 +3,7 @@ // you may not use this file except in compliance with the Elastic License. // +build integration -// +build googlecloud +// +build gcp package storage @@ -11,10 +11,9 @@ import ( "fmt" "testing" - "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" - "github.com/elastic/beats/v7/libbeat/common" mbtest "github.com/elastic/beats/v7/metricbeat/mb/testing" + "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func TestData(t *testing.T) { @@ -29,10 +28,10 @@ func TestData(t *testing.T) { metricPrefix string path string }{ - {"googlecloud.storage", "./_meta/data.json"}, - {"googlecloud.storage.authz", "./_meta/data_authz.json"}, - {"googlecloud.storage.network", "./_meta/data_network.json"}, - {"googlecloud.storage.storage", "./_meta/data_storage.json"}, + {"gcp.storage", "./_meta/data.json"}, + {"gcp.storage.authz", "./_meta/data_authz.json"}, + {"gcp.storage.network", "./_meta/data_network.json"}, + {"gcp.storage.storage", "./_meta/data_storage.json"}, } config := metrics.GetConfigForTest(t, "storage") diff --git a/x-pack/metricbeat/module/googlecloud/storage/storage_test.go b/x-pack/metricbeat/module/gcp/storage/storage_test.go similarity index 78% rename from x-pack/metricbeat/module/googlecloud/storage/storage_test.go rename to x-pack/metricbeat/module/gcp/storage/storage_test.go index 371c3a90600..51937f86f27 100644 --- a/x-pack/metricbeat/module/googlecloud/storage/storage_test.go +++ b/x-pack/metricbeat/module/gcp/storage/storage_test.go @@ -10,8 +10,8 @@ import ( "github.com/elastic/beats/v7/metricbeat/mb" // Register input module and metricset - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud" - _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/googlecloud/metrics" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp" + _ "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp/metrics" ) func init() { diff --git a/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go b/x-pack/metricbeat/module/gcp/timeseries_metadata_collector.go similarity index 99% rename from x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go rename to x-pack/metricbeat/module/gcp/timeseries_metadata_collector.go index 75441e53853..4fc5a34c9da 100644 --- a/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector.go +++ b/x-pack/metricbeat/module/gcp/timeseries_metadata_collector.go @@ -2,7 +2,7 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. -package googlecloud +package gcp import ( "context" diff --git a/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector_test.go b/x-pack/metricbeat/module/gcp/timeseries_metadata_collector_test.go similarity index 95% rename from x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector_test.go rename to x-pack/metricbeat/module/gcp/timeseries_metadata_collector_test.go index 38ac903e2e3..388af07c3c9 100644 --- a/x-pack/metricbeat/module/googlecloud/timeseries_metadata_collector_test.go +++ b/x-pack/metricbeat/module/gcp/timeseries_metadata_collector_test.go @@ -2,7 +2,7 @@ // or more contributor license agreements. Licensed under the Elastic License; // you may not use this file except in compliance with the Elastic License. -package googlecloud +package gcp import ( "testing" diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data.json b/x-pack/metricbeat/module/googlecloud/compute/_meta/data.json deleted file mode 100644 index 36c46744b50..00000000000 --- a/x-pack/metricbeat/module/googlecloud/compute/_meta/data.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "@timestamp": "2017-10-12T08:05:34.853Z", - "cloud": { - "account": { - "id": "elastic-observability" - }, - "instance": { - "id": "2438671519308240892", - "name": "heartbeat-mumbai" - }, - "machine": { - "type": "f1-micro" - }, - "provider": "googlecloud" - }, - "cloud.availability_zone": "asia-south1-c", - "cloud.region": "asia-south1", - "event": { - "dataset": "googlecloud.compute", - "duration": 115000, - "module": "googlecloud" - }, - "googlecloud": { - "compute": { - "firewall": { - "dropped_bytes_count": { - "value": 435 - }, - "dropped_packets_count": { - "value": 7 - } - }, - "instance": { - "cpu": { - "reserved_cores": { - "value": 0.2 - }, - "usage_time": { - "value": 0.8653667340986431 - }, - "utilization": { - "value": 0.07211389450822024 - } - }, - "uptime": { - "value": 60 - } - } - }, - "labels": {} - }, - "host": { - "cpu": { - "pct": 0.07211389450822024 - }, - "id": "2438671519308240892", - "name": "heartbeat-mumbai" - }, - "metricset": { - "name": "compute", - "period": 10000 - }, - "service": { - "type": "googlecloud" - } -} \ No newline at end of file diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_cpu.json b/x-pack/metricbeat/module/googlecloud/compute/_meta/data_cpu.json deleted file mode 100644 index b43490d1915..00000000000 --- a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_cpu.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "@timestamp": "2017-10-12T08:05:34.853Z", - "cloud": { - "account": { - "id": "elastic-observability" - }, - "instance": { - "id": "7925831082803123728", - "name": "heartbeat-tokyo" - }, - "machine": { - "type": "f1-micro" - }, - "provider": "googlecloud" - }, - "cloud.availability_zone": "asia-northeast1-b", - "cloud.region": "asia-northeast1", - "event": { - "dataset": "googlecloud.compute", - "duration": 115000, - "module": "googlecloud" - }, - "googlecloud": { - "compute": { - "firewall": { - "dropped_bytes_count": { - "value": 422 - }, - "dropped_packets_count": { - "value": 7 - } - }, - "instance": { - "cpu": { - "reserved_cores": { - "value": 0.2 - }, - "usage_time": { - "value": 0.8921228461549617 - }, - "utilization": { - "value": 0.07434357051291347 - } - }, - "uptime": { - "value": 60 - } - } - }, - "labels": {} - }, - "host": { - "cpu": { - "pct": 0.07434357051291347 - }, - "id": "7925831082803123728", - "name": "heartbeat-tokyo" - }, - "metricset": { - "name": "compute", - "period": 10000 - }, - "service": { - "type": "googlecloud" - } -} \ No newline at end of file diff --git a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_firewall.json b/x-pack/metricbeat/module/googlecloud/compute/_meta/data_firewall.json deleted file mode 100644 index b43490d1915..00000000000 --- a/x-pack/metricbeat/module/googlecloud/compute/_meta/data_firewall.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "@timestamp": "2017-10-12T08:05:34.853Z", - "cloud": { - "account": { - "id": "elastic-observability" - }, - "instance": { - "id": "7925831082803123728", - "name": "heartbeat-tokyo" - }, - "machine": { - "type": "f1-micro" - }, - "provider": "googlecloud" - }, - "cloud.availability_zone": "asia-northeast1-b", - "cloud.region": "asia-northeast1", - "event": { - "dataset": "googlecloud.compute", - "duration": 115000, - "module": "googlecloud" - }, - "googlecloud": { - "compute": { - "firewall": { - "dropped_bytes_count": { - "value": 422 - }, - "dropped_packets_count": { - "value": 7 - } - }, - "instance": { - "cpu": { - "reserved_cores": { - "value": 0.2 - }, - "usage_time": { - "value": 0.8921228461549617 - }, - "utilization": { - "value": 0.07434357051291347 - } - }, - "uptime": { - "value": 60 - } - } - }, - "labels": {} - }, - "host": { - "cpu": { - "pct": 0.07434357051291347 - }, - "id": "7925831082803123728", - "name": "heartbeat-tokyo" - }, - "metricset": { - "name": "compute", - "period": 10000 - }, - "service": { - "type": "googlecloud" - } -} \ No newline at end of file diff --git a/x-pack/metricbeat/module/googlecloud/fields.go b/x-pack/metricbeat/module/googlecloud/fields.go deleted file mode 100644 index d74009bff14..00000000000 --- a/x-pack/metricbeat/module/googlecloud/fields.go +++ /dev/null @@ -1,23 +0,0 @@ -// 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. - -// Code generated by beats/dev-tools/cmd/asset/asset.go - DO NOT EDIT. - -package googlecloud - -import ( - "github.com/elastic/beats/v7/libbeat/asset" -) - -func init() { - if err := asset.SetFields("metricbeat", "googlecloud", asset.ModuleFieldsPri, AssetGooglecloud); err != nil { - panic(err) - } -} - -// AssetGooglecloud returns asset data. -// This is the base64 encoded gzipped contents of module/googlecloud. -func AssetGooglecloud() string { - return "eJzcXF9v2zgSf++nGOxLt4fUBe7eisMCXRe3G6C5C5BsXwWKGtvcUKTKP/Gqn/5AUpIlWZJlW1KabZ9iW5zfb/5xZijpPTxh/hG2Um45Ui5t8gbAMMPxI7z9zX8Ka/cx3HNiNlKlb98AKORINH6EGA15A5CgpoplhknxEX55AwDw2/oeUplYjm8ANgx5oj/6L96DICm2Rbp/Js/c50rarPikfl39Wk5i5Lr6uLxUxn8iNbWPO3CV/wpuXj6kUjAjFRNbSNEoRvWxiDaWOh6rUa3+0fiqF5P7Fz6Mwi+eMN9LlXQunKIhCTFkrsUd1VnW1rk2mE62dLnsTxXm8P+n0z7QWDeRNvYe2fFtlJIsY2Jb/PSnxuIDnnRXeIzZEQMKjVUCE9gomUIjgD7d38I3iypfHdGKGedMbGvLtiOsSbIeI0foGkJ/DSuXth7pz1TqoJNO83XZvYVhLbXxv9bABOU2QVC4tZyoGzDkrxsgyZ9WmxSFuQEiElDSisQpH5WSatWJiolnyShGqRRmdymyUiEKM6kM+LW6xWVKet9g7fVGy7oPK8DtZ5AbMDssDV1Kj5FLsdVgZDcEIw3hndI3XJJ2BDVkP7pLK3kklVaYY8ejMs2swRkcbx1WPtPxmNCGCNrtd23hfYvVF9wwhXvC20ocXnRo4friiZJZhkkU5wZ1RL2Knwm3bfhNic7kPT9oqPNWUJk64/nlS2EQ596TBogdA8wIfUIzI8RCwGiQlf9ldhbLKNSonjGJqFSoRzA+2hh6Of/XpjEqF9B+7UoUSOE571zqK8K9x52bWK1hnH0nbvVJgT46AyhC3V8lIMK5pMRgAuv7P8KOxTRQqxQKw3NgwtUyJZVx8DXZYmRYipOi/8MtCxupHOZC1UyARipFonsdKmH6aSaPInMF+tqt5ywUAt1JCuVDD5kWKJnNCMlBCIhu/wcyQ+X99Fj/dVR7xQwuoysnyqAAI08rK8CaX1tezgl1VcGTDQbOIIwGhN/l3v/Ox+3XO9gRDTGiAGWFYGJ7MyZ4BJq9VHPFD0X2PNtmeRRDQVqII6eTfm4dGOfaLyuU5X55GU6NwiyjRycJ5DOq87Atpr9x+A4NbypVvordLijFPG5O0kiz72P2wrGk3T7uG4Giinf8AxMX0yHeV/C4Y7oott2WLgXPgTwTxknMwz769a7oUUPX4XKmuxj/CRuSMp6vThKzGpMJid0FEofqw62/JCe9J1nExEyh5Ox2ZDG/lTJR4Nxa1CbEPjMa5F54TKAzQnEh/tLOlUs6FVDu2FXCCzowcnYNVMNDSZKYcCLoPCOXL5Ik8Gsp4MwGeGdM1t6g+7PSFSD6gNTBxC7LiiRS+M0ZaZSbjC9ZnHuIqpmq7TfE7Yteog5u8vvj4/2HB284CJZzCV+W+PSxl/cxmAd7hbboBOO8gua+7oLfD/mllU05Q2G00+9lwBfT8bnwdCaFHteYTKXYIPKEGxca7x4B8n+tmDCoRM8gcLG0UALCrUKtR2hxQIfjNOiVdvvl1zKYDrqCn13qf1zfw4bLvQZm3mrwWA7zMimAZBln1LdgoI1Ckvod5F3bSVrUxlSvl5FrlK0D9IppjSPXh5WJZe1QIDOyAXkeO5TcljREJ7+eqTzNIq15lCn5V/6j7NWUS+3nnUKgH/n1Tz3HJ7f6rLNaN5Rbe1QIBlXKhJ8n+ibscX3/4eHhC3jN9Kfi0SnkMqxt1/16Vwstq/28ehjg+OCaBuHB+b7ejUMocL+wranCsw0tMxQTw1yHbrEWy9IabYg/PWxBV9Judz6T9uB931v0+7sijiNxvlOw6tTRxtrGM7Ql9zZ+sPGZ7Yi2cbXeZZnuwVZ/OCrehS7LcIQ+RSlqf9wwVUiubWo5MewZw7YVGlUvQzuBQu45JttQb346/F2VozdBA+EHCXL2jCr3AIabEi63IbtMUYKGo97cIGj2HcvqwYoGgYrWz2T1tCKrEkb1xTtgAkjD5AP5x6ZRLfBKw0ybiCrIhWLR10hNiG81ZFbvAEWSSSbMDcTWgJAGcjQNEw6TsaISMg+ZWc0heeJaLy/jQCAi2ynOFj5tEX4+HB+8Kx0sCO0h1sfrLFqZ5Tyqx311pDJrBqjxqegcDnMaIa9QW25W8B+pgECCGyZYeeDadanGWj7+cEjIDYV8SGXiaSdIEs4E9vI/rbmpu/JT+upMjIWWhtEua2Mn8lUbdwnDeiVdaFG9Wwii3gExBtOsGyL8ITh7Qs9F3/jE5a/xcyQFLM04pihMaE8TidrvHjExdOdv7Kwy8goeJCChu1IlYR5NpTCECdfpYuOClW8668KUc4fQE/v73JzPuA1ty55RNK4FSnzfjERBarlhGUcwLMWBYWdD567SEpRNsol9ZtooFtvS9z2lUgeVIL9HpIwqWW4UZ3mMPzhctL7z/Vect0LWyDJc3cZdzOYuKfPCpMMVRy+0jT2UAO5dGP8NNrUOjS6RYiqxzXwIe2Z2IKR473JP3lAwS85Lly1my/pJi99SzvFvKhP85SIXGavHaua/qHsUQ/+zHMAxjjgag2rZJJjZmDO9C62VQwEBBRiZMXoWh17rLUJkv5MaoZQNe6LBZomfN8Q53MmEbfJP9Olz+YNrOvjRqWwezsdkxsXseD5LpNWRJjmFvWh9FboiDD2PpTvgzv63BHRBG9/PJYrzSOF26Fbhl2J1A7GST+hK6L04lFUF2gsmF0ty7ZlhTEWyZdCZB3/dc6ZL/LEL96RmmYjBhWbRiAtVkIhPg03q6MLwZTeeZkdxnMAv3H5OkfyBivxjzuHY4iy+zt8jKvXkXMKTJ3UrpEi0VSFmQtoJ99QxHe62NLL8CXyz0pDG0yj9h81SbNg2CvXVdAekXXYJomwgBHRHhEsFG6nCJKaZBWo2qJTg5YdnDE+YpdyDFktzfUcC1+S3w6ODGaOXHdk9ukuvPKx7tY2YRpEsPor2LdirncrMcYPlkJ7maRN+sNK6aL//pjX1Nex+5KL0Gl6TVgXXlQK1IsBvtb40GDh5eOl64Nqdv4wQZ+55DkyaGd7L8bHjDfHulZQk53p3tUMIkumdbI9tx95BVFx9ZUVSJMVFB0M9U5OC0MkE/kKJexj1pdltmZue+oYFJ1XewLdEpJ1AeqGahU1nvhfrXMXWEU2q19HYLlTla9vUDq2XVGQ7xztdHsLKZ95DSjI2OvEPP3oypskY+zzAZ+SGHCzw6f4WKPF3iNS07uLUfZOi2cnEoyhV71tLoDLB7j2PWLP7fiXv+r2vPIqJxiQqXlhFKEU9nVO2tFFNv4p3WjlH8zElihdmQYyuz94qItyOHNCAlhx5DolFV0wWv/y0/jJQOTpihyJ1Mj7h7SHOrusvtSK4nQiGT/kKVesMKdswGjmsqTXTDgRami8HXClJ6kosMXRoc/jlDZe73FkvbLiYb+t1De1H+a+NRrjkrQlXkul8J8FUaeU4uV9n5cLHJ3sa0tc6tWcz/PIaMlQQW/qEpqGIgg1QTnTZjnoQ4B/7LvpVKSj6FRKSh7fFOQVWv1OYhSdTiClmwiTN/FvP/IOTz4SXj4JIa/ylCRl4ZsW/asH7SVTUx6/a6w90pqu6yzKWcF5ZuHhtww9m5P8HAAD//wY8Aj8=" -} diff --git a/x-pack/metricbeat/modules.d/googlecloud.yml.disabled b/x-pack/metricbeat/modules.d/gcp.yml.disabled similarity index 87% rename from x-pack/metricbeat/modules.d/googlecloud.yml.disabled rename to x-pack/metricbeat/modules.d/gcp.yml.disabled index 4dd52de0a0b..1d5c7e6a69d 100644 --- a/x-pack/metricbeat/modules.d/googlecloud.yml.disabled +++ b/x-pack/metricbeat/modules.d/gcp.yml.disabled @@ -1,7 +1,7 @@ -# Module: googlecloud -# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-googlecloud.html +# Module: gcp +# Docs: https://www.elastic.co/guide/en/beats/metricbeat/master/metricbeat-module-gcp.html -- module: googlecloud +- module: gcp metricsets: - compute region: "us-" @@ -10,7 +10,7 @@ exclude_labels: false period: 1m -- module: googlecloud +- module: gcp metricsets: - pubsub - loadbalancing @@ -20,7 +20,7 @@ exclude_labels: false period: 1m -- module: googlecloud +- module: gcp metricsets: - storage project_id: "your project id" @@ -28,7 +28,7 @@ exclude_labels: false period: 5m -- module: googlecloud +- module: gcp metricsets: - metrics project_id: "your project id" @@ -44,7 +44,7 @@ - "instance/cpu/utilization" - "instance/uptime" -- module: googlecloud +- module: gcp metricsets: - billing period: 24h