Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fix metric mapping of counter metrics in the Openmetrics V2 version of the check #13573

Merged
merged 13 commits into from
Jan 12, 2023
Merged

Fix metric mapping of counter metrics in the Openmetrics V2 version of the check #13573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
15d7b32
fix counter metrics
steveny91 Dec 23, 2022
fd6b8df
remove misnamed metric
steveny91 Dec 23, 2022
a3d8116
add counter metrics for validations
steveny91 Dec 23, 2022
279b98a
styling
steveny91 Dec 23, 2022
d0c7f76
remove unused variable
steveny91 Dec 23, 2022
70427cb
styling
steveny91 Dec 23, 2022
69bb440
more metric to assert
steveny91 Dec 23, 2022
814d133
add count metrics to metadata.csv
steveny91 Dec 25, 2022
f3bc12a
clean up whitespace
steveny91 Dec 25, 2022
651b5d9
fix unit
steveny91 Dec 25, 2022
ef4e315
change metadata.csv order for OMv2 metrics
steveny91 Dec 25, 2022
11c6549
add few missing metrics
steveny91 Dec 25, 2022
49ecebd
clean up metadata.csv
steveny91 Dec 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 34 additions & 33 deletions envoy/datadog_checks/envoy/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,32 +72,32 @@
'envoy_cluster_upstream_cx_destroy_remote': 'cluster.upstream_cx_destroy_remote',
'envoy_cluster_upstream_cx_destroy_remote_with_active_rq': 'cluster.upstream_cx_destroy_with_active_rq',
'envoy_cluster_upstream_cx_destroy_with_active_rq': 'cluster.upstream_cx_destroy_with_active_rq',
'envoy_cluster_upstream_cx_http1_total': 'cluster.upstream_cx_http1_total',
'envoy_cluster_upstream_cx_http2_total': 'cluster.upstream_cx_http2_total',
'envoy_cluster_upstream_cx_http3_total': 'cluster.upstream_cx_http3_total',
'envoy_cluster_upstream_cx_http1': 'cluster.upstream_cx_http1',
'envoy_cluster_upstream_cx_http2': 'cluster.upstream_cx_http2',
'envoy_cluster_upstream_cx_http3': 'cluster.upstream_cx_http3',
'envoy_cluster_upstream_cx_idle_timeout': 'cluster.upstream_cx_idle_timeout',
'envoy_cluster_upstream_cx_max_requests': 'cluster.upstream_cx_max_requests',
'envoy_cluster_upstream_cx_none_healthy': 'cluster.upstream_cx_none_healthy',
'envoy_cluster_upstream_cx_overflow': 'cluster.upstream_cx_overflow',
'envoy_cluster_upstream_cx_pool_overflow': 'cluster.upstream_cx_pool_overflow',
'envoy_cluster_upstream_cx_protocol_error': 'cluster.upstream_cx_protocol_error',
'envoy_cluster_upstream_cx_rx_bytes_total': 'cluster.upstream_cx_rx_bytes_total',
'envoy_cluster_upstream_cx_total': 'cluster.upstream_cx',
'envoy_cluster_upstream_cx_tx_bytes_total': 'cluster.upstream_cx_tx_bytes_total',
'envoy_cluster_upstream_flow_control_backed_up_total': 'cluster.upstream_flow_control_backed_up_total',
'envoy_cluster_upstream_flow_control_drained_total': 'cluster.upstream_flow_control_drained_total',
'envoy_cluster_upstream_flow_control_paused_reading_total': 'cluster.upstream_flow_control_paused_reading_total',
'envoy_cluster_upstream_flow_control_resumed_reading_total': 'cluster.upstream_flow_control_resumed_reading_total',
'envoy_cluster_upstream_internal_redirect_failed_total': 'cluster.upstream_internal_redirect_failed_total',
'envoy_cluster_upstream_internal_redirect_succeeded_total': 'cluster.upstream_internal_redirect_succeeded_total',
'envoy_cluster_upstream_cx_rx_bytes': 'cluster.upstream_cx_rx_bytes',
'envoy_cluster_upstream_cx_tx_bytes': 'cluster.upstream_cx_tx_bytes',
'envoy_cluster_upstream_cx': 'cluster.upstream_cx',
'envoy_cluster_upstream_flow_control_backed_up': 'cluster.upstream_flow_control_backed_up',
'envoy_cluster_upstream_flow_control_drained': 'cluster.upstream_flow_control_drained',
'envoy_cluster_upstream_flow_control_paused_reading': 'cluster.upstream_flow_control_paused_reading',
'envoy_cluster_upstream_flow_control_resumed_reading': 'cluster.upstream_flow_control_resumed_reading',
'envoy_cluster_upstream_internal_redirect_failed': 'cluster.upstream_internal_redirect_failed',
'envoy_cluster_upstream_internal_redirect_succeeded': 'cluster.upstream_internal_redirect_succeeded',
'envoy_cluster_upstream_rq': 'cluster.upstream_rq',
'envoy_cluster_upstream_rq_cancelled': 'cluster.upstream_rq_cancelled',
'envoy_cluster_upstream_rq_completed': 'cluster.upstream_rq_completed',
'envoy_cluster_upstream_rq_maintenance_mode': 'cluster.upstream_rq_maintenance_mode',
'envoy_cluster_upstream_rq_max_duration_reached': 'cluster.upstream_rq_max_duration_reached',
'envoy_cluster_upstream_rq_pending_failure_eject': 'cluster.upstream_rq_pending_failure_eject',
'envoy_cluster_upstream_rq_pending_overflow': 'cluster.upstream_rq_pending_overflow',
'envoy_cluster_upstream_rq_pending_total': 'cluster.upstream_rq_pending_total',
'envoy_cluster_upstream_rq_pending': 'cluster.upstream_rq_pending',
'envoy_cluster_upstream_rq_per_try_timeout': 'cluster.upstream_rq_per_try_timeout',
'envoy_cluster_upstream_rq_retry': 'cluster.upstream_rq_retry',
'envoy_cluster_upstream_rq_retry_backoff_exponential': 'cluster.upstream_rq_retry_backoff_exponential',
Expand All @@ -106,8 +106,9 @@
'envoy_cluster_upstream_rq_retry_overflow': 'cluster.upstream_rq_retry_overflow',
'envoy_cluster_upstream_rq_retry_success': 'cluster.upstream_rq_retry_success',
'envoy_cluster_upstream_rq_rx_reset': 'cluster.upstream_rq_rx_reset',
'envoy_cluster_upstream_rq_time': 'cluster.upstream_rq_time',
'envoy_cluster_upstream_rq_timeout': 'cluster.upstream_rq_timeout',
'envoy_cluster_upstream_rq_total': 'cluster.upstream_rq_total',
'envoy_cluster_upstream_rq': 'cluster.upstream_rq',
'envoy_cluster_upstream_rq_tx_reset': 'cluster.upstream_rq_tx_reset',
'envoy_cluster_upstream_rq_xx': 'cluster.upstream_rq_xx',
'envoy_cluster_manager_cds_control_plane_rate_limit_enforced': (
Expand Down Expand Up @@ -138,26 +139,26 @@
'envoy_http_downstream_cx_destroy_remote': 'http.downstream_cx_destroy_remote',
'envoy_http_downstream_cx_destroy_remote_active_rq': 'http.downstream_cx_destroy_remote_active_rq',
'envoy_http_downstream_cx_drain_close': 'http.downstream_cx_drain_close',
'envoy_http_downstream_cx_http1_total': 'http.downstream_cx_http1_total',
'envoy_http_downstream_cx_http2_total': 'http.downstream_cx_http2_total',
'envoy_http_downstream_cx_http3_total': 'http.downstream_cx_http3_total',
'envoy_http_downstream_cx_http1': 'http.downstream_cx_http1',
'envoy_http_downstream_cx_http2': 'http.downstream_cx_http2',
'envoy_http_downstream_cx_http3': 'http.downstream_cx_http3',
'envoy_http_downstream_cx_idle_timeout': 'http.downstream_cx_idle_timeout',
'envoy_http_downstream_cx_max_duration_reached': 'http.downstream_cx_max_duration_reached',
'envoy_http_downstream_cx_overload_disable_keepalive': 'http.downstream_cx_overload_disable_keepalive',
'envoy_http_downstream_cx_protocol_error': 'http.downstream_cx_protocol_error',
'envoy_http_downstream_cx_rx_bytes_total': 'http.downstream_cx_rx_bytes_total',
'envoy_http_downstream_cx_ssl_total': 'http.downstream_cx_ssl_total',
'envoy_http_downstream_cx_total': 'http.downstream_cx_total',
'envoy_http_downstream_cx_tx_bytes_total': 'http.downstream_cx_tx_bytes_total',
'envoy_http_downstream_cx_upgrades_total': 'http.downstream_cx_upgrades_total',
'envoy_http_downstream_flow_control_paused_reading_total': 'http.downstream_flow_control_paused_reading_total',
'envoy_http_downstream_flow_control_resumed_reading_total': 'http.downstream_flow_control_resumed_reading_total',
'envoy_http_downstream_cx_rx_bytes': 'http.downstream_cx_rx_bytes',
'envoy_http_downstream_cx_ssl': 'http.downstream_cx_ssl',
'envoy_http_downstream_cx': 'http.downstream_cx',
'envoy_http_downstream_cx_tx_bytes': 'http.downstream_cx_tx_bytes',
'envoy_http_downstream_cx_upgrades': 'http.downstream_cx_upgrades',
'envoy_http_downstream_flow_control_paused_reading': 'http.downstream_flow_control_paused_reading',
'envoy_http_downstream_flow_control_resumed_reading': 'http.downstream_flow_control_resumed_reading',
'envoy_http_downstream_rq_completed': 'http.downstream_rq_completed',
'envoy_http_downstream_rq_failed_path_normalization': 'http.downstream_rq_failed_path_normalization',
'envoy_http_downstream_rq_header_timeout': 'http.downstream_rq_header_timeout',
'envoy_http_downstream_rq_http1_total': 'http.downstream_rq_http1_total',
'envoy_http_downstream_rq_http2_total': 'http.downstream_rq_http2_total',
'envoy_http_downstream_rq_http3_total': 'http.downstream_rq_http3_total',
'envoy_http_downstream_rq_http1': 'http.downstream_rq_http1',
'envoy_http_downstream_rq_http2': 'http.downstream_rq_http2',
'envoy_http_downstream_rq_http3': 'http.downstream_rq_http3',
'envoy_http_downstream_rq_idle_timeout': 'http.downstream_rq_idle_timeout',
'envoy_http_downstream_rq_max_duration_reached': 'http.downstream_rq_max_duration_reached',
'envoy_http_downstream_rq_non_relative_path': 'http.downstream_rq_non_relative_path',
Expand All @@ -167,7 +168,7 @@
'envoy_http_downstream_rq_rx_reset': 'http.downstream_rq_rx_reset',
'envoy_http_downstream_rq_timeout': 'http.downstream_rq_timeout',
'envoy_http_downstream_rq_too_large': 'http.downstream_rq_too_large',
'envoy_http_downstream_rq_total': 'http.downstream_rq_total',
'envoy_http_downstream_rq': 'http.downstream_rq',
'envoy_http_downstream_rq_tx_reset': 'http.downstream_rq_tx_reset',
'envoy_http_downstream_rq_ws_on_non_ws_route': 'http.downstream_rq_ws_on_non_ws_route',
'envoy_http_downstream_rq_xx': 'http.downstream_rq_xx',
Expand All @@ -183,7 +184,7 @@
'envoy_http_rq_direct_response': 'http.rq_direct_response',
'envoy_http_rq_redirect': 'http.rq_redirect',
'envoy_http_rq_reset_after_downstream_response_started': 'http.rq_reset_after_downstream_response_started',
'envoy_http_rq_total': 'http.rq_total',
'envoy_http_rq': 'http.rq',
'envoy_http_rs_too_large': 'http.rs_too_large',
'envoy_http_tracing_client_enabled': 'http.tracing.client_enabled',
'envoy_http_tracing_health_check': 'http.tracing.health_check',
Expand All @@ -199,7 +200,7 @@
'envoy_listener_admin_downstream_cx_destroy': 'listener.admin.downstream_cx_destroy',
'envoy_listener_admin_downstream_cx_overflow': 'listener.admin.downstream_cx_overflow',
'envoy_listener_admin_downstream_cx_overload_reject': 'listener.admin.downstream_cx_overload_reject',
'envoy_listener_admin_downstream_cx_total': 'listener.admin.downstream_cx_total',
'envoy_listener_admin_downstream_cx': 'listener.admin.downstream_cx',
'envoy_listener_admin_downstream_global_cx_overflow': 'listener.admin.downstream_global_cx_overflow',
'envoy_listener_admin_downstream_pre_cx_timeout': 'listener.admin.downstream_pre_cx_timeout',
'envoy_listener_admin_http_downstream_rq_completed': 'listener.admin.http.downstream_rq_completed',
Expand All @@ -208,7 +209,7 @@
'envoy_listener_downstream_cx_destroy': 'listener.downstream_cx_destroy',
'envoy_listener_downstream_cx_overflow': 'listener.downstream_cx_overflow',
'envoy_listener_downstream_cx_overload_reject': 'listener.downstream_cx_overload_reject',
'envoy_listener_downstream_cx_total': 'listener.downstream_cx_total',
'envoy_listener_downstream_cx': 'listener.downstream_cx',
'envoy_listener_downstream_global_cx_overflow': 'listener.downstream_global_cx_overflow',
'envoy_listener_downstream_pre_cx_timeout': 'listener.downstream_pre_cx_timeout',
'envoy_listener_http_downstream_rq_completed': 'listener.http.downstream_rq_completed',
Expand Down Expand Up @@ -243,7 +244,7 @@
'envoy_vhost_vcluster_upstream_rq_retry_overflow': 'vhost.vcluster.upstream_rq_retry_overflow',
'envoy_vhost_vcluster_upstream_rq_retry_success': 'vhost.vcluster.upstream_rq_retry_success',
'envoy_vhost_vcluster_upstream_rq_timeout': 'vhost.vcluster.upstream_rq_timeout',
'envoy_vhost_vcluster_upstream_rq_total': 'vhost.vcluster.upstream_rq_total',
'envoy_vhost_vcluster_upstream_rq': 'vhost.vcluster.upstream_rq',
'envoy_cluster_http2_pending_send_bytes': 'cluster.http2.pending_send_bytes',
'envoy_cluster_http2_streams_active': 'cluster.http2.streams_active',
'envoy_cluster_lb_subsets_active': 'cluster.lb_subsets_active',
Expand All @@ -255,7 +256,7 @@
'envoy_cluster_version': 'cluster.version',
'envoy_cluster_upstream_cx_active': 'cluster.upstream_cx_active',
'envoy_cluster_upstream_cx_rx_bytes_buffered': 'cluster.upstream_cx_rx_bytes_buffered',
'envoy_cluster_upstream_cx_tx_bytes_buffered': 'cluster.upstream_cx_tx_bytes_total',
'envoy_cluster_upstream_cx_tx_bytes_buffered': 'cluster.upstream_cx_tx_bytes_buffered',
'envoy_cluster_upstream_rq_active': 'cluster.upstream_rq_active',
'envoy_cluster_upstream_rq_pending_active': 'cluster.upstream_rq_pending_active',
'envoy_cluster_manager_active_clusters': 'cluster_manager.active_clusters',
Expand Down
Loading