usm: Add http2/gRPC monitoring configuration

DataDog · Feb 19, 2025 · 0f8fc6b · 0f8fc6b
1 parent 0a11075
commit 0f8fc6b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md
@@ -8,6 +8,7 @@
   * `datadog.serviceMonitoring.tls.nodejs.enabled` to control Node.js TLS monitoring.
   * `datadog.serviceMonitoring.tls.native.enabled` to control native (openssl, libssl, gnutls) TLS monitoring.
   * `datadog.serviceMonitoring.httpMonitoringEnabled` to control HTTP monitoring.
+  * `datadog.serviceMonitoring.http2MonitoringEnabled` to control HTTP/2 & gRPC monitoring.
 
 ## 3.90.5
 

diff --git a/charts/datadog/README.md b/charts/datadog/README.md
@@ -855,6 +855,7 @@ helm install <RELEASE_NAME> \
 | datadog.securityAgent.runtime.useSecruntimeTrack | bool | `true` | Set to true to send Cloud Workload Security (CWS) events directly to the Agent events explorer |
 | datadog.securityContext | object | `{"runAsUser":0}` | Allows you to overwrite the default PodSecurityContext on the Daemonset or Deployment |
 | datadog.serviceMonitoring.enabled | bool | `false` | Enable Universal Service Monitoring |
+| datadog.serviceMonitoring.http2MonitoringEnabled | string | `nil` | Enable HTTP2 & gRPC monitoring for Universal Service Monitoring (Requires Agent 7.53.0+ and kernel 5.2 or later). Empty values use the agent's default. |
 | datadog.serviceMonitoring.httpMonitoringEnabled | string | `nil` | Enable HTTP monitoring for Universal Service Monitoring (Requires Agent 7.40.0+). Empty values use the agent's default. |
 | datadog.serviceMonitoring.tls.go.enabled | bool | `nil` | Enable TLS monitoring for Golang services (Requires Agent 7.51.0+). Empty values use the agent's default. |
 | datadog.serviceMonitoring.tls.istio.enabled | bool | `nil` | Enable TLS monitoring for Istio services (Requires Agent 7.50.0+). Empty values use the agent's default. |

diff --git a/charts/datadog/templates/system-probe-configmap.yaml b/charts/datadog/templates/system-probe-configmap.yaml
@@ -46,6 +46,9 @@ data:
       {{- if not (eq .Values.datadog.serviceMonitoring.enableHTTPMonitoring nil) }}
       enable_http_monitoring: {{ $.Values.datadog.serviceMonitoring.enableHTTPMonitoring }}
       {{- end }}
+      {{- if not (eq .Values.datadog.serviceMonitoring.enableHTTP2Monitoring nil) }}
+      enable_http2_monitoring: {{ $.Values.datadog.serviceMonitoring.enableHTTP2Monitoring }}
+      {{- end }}
       tls:
         {{- if not (eq .Values.datadog.serviceMonitoring.tls.go.enabled nil) }}
         go:

diff --git a/charts/datadog/values.yaml b/charts/datadog/values.yaml
@@ -834,6 +834,9 @@ datadog:
     # datadog.serviceMonitoring.httpMonitoringEnabled -- Enable HTTP monitoring for Universal Service Monitoring (Requires Agent 7.40.0+). Empty values use the agent's default.
     httpMonitoringEnabled:
 
+    # datadog.serviceMonitoring.http2MonitoringEnabled -- Enable HTTP2 & gRPC monitoring for Universal Service Monitoring (Requires Agent 7.53.0+ and kernel 5.2 or later). Empty values use the agent's default.
+    http2MonitoringEnabled:
+
     tls:
       go:
         # datadog.serviceMonitoring.tls.go.enabled -- (bool) Enable TLS monitoring for Golang services (Requires Agent 7.51.0+). Empty values use the agent's default.