[Metricbeat] gcp.loadbalancing: uniform metric's fields (#28370)

endorama · endorama · commit c9740f12d716 · 2021-10-14T17:57:11.000+02:00
(cherry picked from commit d85c826) # Conflicts: # metricbeat/docs/fields.asciidoc # x-pack/metricbeat/module/gcp/fields.go
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -28333,12 +28333,6 @@ type: double
 Google Cloud Load Balancing metrics
 
 
-[float]
-=== https
-
-Google Cloud Load Balancing metrics
-
-
 *`gcp.loadbalancing.https.backend_request_bytes_count.value`*::
 +
 --
@@ -28357,6 +28351,15 @@ type: long
 
 --
 
+*`gcp.loadbalancing.https.backend_response_bytes_count.value`*::
++
+--
+The number of bytes sent as responses from backends (or cache) to external HTTP(S) load balancer.
+
+type: long
+
+--
+
 *`gcp.loadbalancing.https.request_bytes_count.value`*::
 +
 --
@@ -28384,11 +28387,41 @@ type: long
 
 --
 
-[float]
-=== l3.internal
+*`gcp.loadbalancing.l3.external.egress_bytes_count.value`*::
++
+--
+The number of bytes sent from external TCP/UDP network load balancer backend to client of the flow. For TCP flows it's counting bytes on application stream only.
 
-Google Cloud Load Balancing metrics
+type: long
+
+--
+
+*`gcp.loadbalancing.l3.external.egress_packets_count.value`*::
++
+--
+The number of packets sent from external TCP/UDP network load balancer backend to client of the flow.
 
+type: long
+
+--
+
+*`gcp.loadbalancing.l3.external.ingress_bytes_count.value`*::
++
+--
+The number of bytes sent from client to external TCP/UDP network load balancer backend. For TCP flows it's counting bytes on application stream only.
+
+type: long
+
+--
+
+*`gcp.loadbalancing.l3.external.ingress_packets_count.value`*::
++
+--
+The number of packets sent from client to external TCP/UDP network load balancer backend.
+
+type: long
+
+--
 
 *`gcp.loadbalancing.l3.internal.egress_bytes_count.value`*::
 +
@@ -28426,12 +28459,6 @@ type: long
 
 --
 
-[float]
-=== tcp_ssl_proxy
-
-Google Cloud Load Balancing metrics
-
-
 *`gcp.loadbalancing.tcp_ssl_proxy.closed_connections.value`*::
 +
 --
diff --git a/x-pack/metricbeat/module/gcp/fields.go b/x-pack/metricbeat/module/gcp/fields.go
diff --git a/x-pack/metricbeat/module/gcp/loadbalancing/_meta/fields.yml b/x-pack/metricbeat/module/gcp/loadbalancing/_meta/fields.yml
@@ -1,59 +1,62 @@
 - name: loadbalancing
+  description: Google Cloud Load Balancing metrics
   release: beta
   type: group
-  description: Google Cloud Load Balancing metrics
   fields:
-    - name: https
-      type: group
-      description: Google Cloud Load Balancing metrics
-      fields:
-        - name: backend_request_bytes_count.value
-          type: long
-          description: The number of bytes sent as requests from HTTP/S load balancer to backends.
-        - name: backend_request_count.value
-          type: long
-          description: The number of requests served by backends of HTTP/S load balancer.
-        - name: request_bytes_count.value
-          type: long
-          description: The number of bytes sent as requests from clients to HTTP/S load balancer.
-        - name: request_count.value
-          type: long
-          description: The number of requests served by HTTP/S load balancer.
-        - name: response_bytes_count.value
-          type: long
-          description: The number of bytes sent as responses from HTTP/S load balancer to clients.
-    - name: l3.internal
-      type: group
-      description: Google Cloud Load Balancing metrics
-      fields:
-      - name: egress_bytes_count.value
-        type: long
-        description: The number of bytes sent from ILB backend to client (for TCP flows it's counting bytes on application stream only).
-      - name: egress_packets_count.value
-        type: long
-        description: The number of packets sent from ILB backend to client of the flow.
-      - name: ingress_bytes_count.value
-        type: long
-        description: The number of bytes sent from client to ILB backend (for TCP flows it's counting bytes on application stream only).
-      - name: ingress_packets_count.value
-        type: long
-        description: The number of packets sent from client to ILB backend.
-    - name: tcp_ssl_proxy
-      type: group
-      description: Google Cloud Load Balancing metrics
-      fields:
-        - name: closed_connections.value
-          type: long
-          description: Number of connections that were terminated over TCP/SSL proxy.
-        - name: egress_bytes_count.value
-          type: long
-          description: Number of bytes sent from VM to client using proxy.
-        - name: ingress_bytes_count.value
-          type: long
-          description: Number of bytes sent from client to VM using proxy.
-        - name: new_connections.value
-          type: long
-          description: Number of connections that were created over TCP/SSL proxy.
-        - name: open_connections.value
-          type: long
-          description: Current number of outstanding connections through the TCP/SSL proxy.
+  - name: https.backend_request_bytes_count.value
+    type: long
+    description: The number of bytes sent as requests from HTTP/S load balancer to backends.
+  - name: https.backend_request_count.value
+    type: long
+    description: The number of requests served by backends of HTTP/S load balancer.
+  - name: https.backend_response_bytes_count.value
+    type: long
+    description: The number of bytes sent as responses from backends (or cache) to external HTTP(S) load balancer.
+  - name: https.request_bytes_count.value
+    type: long
+    description: The number of bytes sent as requests from clients to HTTP/S load balancer.
+  - name: https.request_count.value
+    type: long
+    description: The number of requests served by HTTP/S load balancer.
+  - name: https.response_bytes_count.value
+    type: long
+    description: The number of bytes sent as responses from HTTP/S load balancer to clients.
+  - name: l3.external.egress_bytes_count.value
+    type: long
+    description: The number of bytes sent from external TCP/UDP network load balancer backend to client of the flow. For TCP flows it's counting bytes on application stream only.
+  - name: l3.external.egress_packets_count.value
+    type: long
+    description: The number of packets sent from external TCP/UDP network load balancer backend to client of the flow.
+  - name: l3.external.ingress_bytes_count.value
+    type: long
+    description: The number of bytes sent from client to external TCP/UDP network load balancer backend. For TCP flows it's counting bytes on application stream only.
+  - name: l3.external.ingress_packets_count.value
+    type: long
+    description: The number of packets sent from client to external TCP/UDP network load balancer backend.
+  - name: l3.internal.egress_bytes_count.value
+    type: long
+    description: The number of bytes sent from ILB backend to client (for TCP flows it's counting bytes on application stream only).
+  - name: l3.internal.egress_packets_count.value
+    type: long
+    description: The number of packets sent from ILB backend to client of the flow.
+  - name: l3.internal.ingress_bytes_count.value
+    type: long
+    description: The number of bytes sent from client to ILB backend (for TCP flows it's counting bytes on application stream only).
+  - name: l3.internal.ingress_packets_count.value
+    type: long
+    description: The number of packets sent from client to ILB backend.
+  - name: tcp_ssl_proxy.closed_connections.value
+    type: long
+    description: Number of connections that were terminated over TCP/SSL proxy.
+  - name: tcp_ssl_proxy.egress_bytes_count.value
+    type: long
+    description: Number of bytes sent from VM to client using proxy.
+  - name: tcp_ssl_proxy.ingress_bytes_count.value
+    type: long
+    description: Number of bytes sent from client to VM using proxy.
+  - name: tcp_ssl_proxy.new_connections.value
+    type: long
+    description: Number of connections that were created over TCP/SSL proxy.
+  - name: tcp_ssl_proxy.open_connections.value
+    type: long
+    description: Current number of outstanding connections through the TCP/SSL proxy.
diff --git a/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go b/x-pack/metricbeat/module/gcp/loadbalancing/loadbalancing_integration_test.go
@@ -11,11 +11,27 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"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 TestFetch(t *testing.T) {
+	config := metrics.GetConfigForTest(t, "loadbalancing")
+	fmt.Printf("%+v\n", config)
+
+	metricSet := mbtest.NewReportingMetricSetV2WithContext(t, config)
+	events, errs := mbtest.ReportingFetchV2WithContext(metricSet)
+	if len(errs) > 0 {
+		t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
+	}
+
+	assert.NotEmpty(t, events)
+	mbtest.TestMetricsetFieldsDocumented(t, metricSet, events)
+}
+
 func TestData(t *testing.T) {
 	metricPrefixIs := func(metricPrefix string) func(e common.MapStr) bool {
 		return func(e common.MapStr) bool {
diff --git a/x-pack/metricbeat/module/gcp/loadbalancing/manifest.yml b/x-pack/metricbeat/module/gcp/loadbalancing/manifest.yml
@@ -12,6 +12,10 @@ input:
           - "https/request_bytes_count"
           - "https/request_count"
           - "https/response_bytes_count"
+          - "l3/external/egress_bytes_count"
+          - "l3/external/egress_packets_count"
+          - "l3/external/ingress_bytes_count"
+          - "l3/external/ingress_packets_count"
           - "l3/internal/egress_bytes_count"
           - "l3/internal/egress_packets_count"
           - "l3/internal/ingress_bytes_count"
