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

Add GRPC access log metrics #13932

Merged
merged 9 commits into from
May 1, 2023
Merged

Add GRPC access log metrics #13932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b09b64f
new metric for envoy
steveny91 Feb 10, 2023
b29b1bf
metadata entry
steveny91 Feb 10, 2023
ed1b47a
add new metrics to fixture
steveny91 Feb 10, 2023
16249c2
styling fix
steveny91 Feb 13, 2023
b6d282a
metadata
steveny91 Feb 14, 2023
41d71cd
Add collection for OMv2
steveny91 Feb 24, 2023
6ebc463
add tests
steveny91 Feb 24, 2023
40bf295
move metric to flaky
steveny91 Feb 24, 2023
22b6cd6
Merge branch 'master' into sy/envoy-access-logs
steveny91 Apr 28, 2023
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
18 changes: 18 additions & 0 deletions envoy/datadog_checks/envoy/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,8 @@
'envoy_cluster_outlier_detection_ejections_detected_failure_percentage': 'cluster.outlier_detection.ejections_detected_failure_percentage', # noqa: E501
'envoy_cluster_outlier_detection_ejections_enforced_failure_percentage_local_origin': 'cluster.outlier_detection.ejections_enforced_failure_percentage_local_origin', # noqa: E501
'envoy_cluster_outlier_detection_ejections_detected_failure_percentage_local_origin': 'cluster.outlier_detection.ejections_detected_failure_percentage_local_origin', # noqa: E501
'envoy_access_logs_grpc_access_log_logs_dropped': 'access_logs.grpc_access_log.logs_dropped',
'envoy_access_logs_grpc_access_log_logs_written': 'access_logs.grpc_access_log.logs_written',
}

# fmt: off
Expand Down Expand Up @@ -3820,6 +3822,22 @@
),
'method': 'monotonic_count',
},
'access_logs.grpc_access_log.logs_dropped': {
'tags': (
(),
(),
(),
),
'method': 'monotonic_count',
},
'access_logs.grpc_access_log.logs_written': {
'tags': (
(),
(),
(),
),
'method': 'monotonic_count',
},
}
# fmt: on

Expand Down
4 changes: 4 additions & 0 deletions envoy/metadata.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,3 +944,7 @@ envoy.cluster.zone.upstream_rq_time.99percentile,gauge,,millisecond,,[Legacy] Zo
envoy.cluster.zone.upstream_rq_time.99_9percentile,gauge,,millisecond,,[Legacy] Zone request time in milliseconds 99.9-percentile,-1,envoy,,
envoy.cluster.zone.upstream_rq_time.100percentile,gauge,,millisecond,,[Legacy] Zone request time in milliseconds 100-percentile,-1,envoy,,
envoy.sds.key_rotation_failed,count,,,,[Legacy] [API v3 only] Total number of filesystem key rotations that failed outside of an SDS update.,-1,envoy,,
envoy.access_logs.grpc_access_log.logs_dropped,count,,,,[Legacy] Number of GRPC Access Logs dropped,-1,envoy,,
envoy.access_logs.grpc_access_log.logs_written,count,,,,[Legacy] Number of GRPC Access Logs written,-1,envoy,,
envoy.access_logs.grpc_access_log.logs_dropped.count,count,,,,[OpenMetrics V2] Count of GRPC Access Logs dropped,-1,envoy,,
envoy.access_logs.grpc_access_log.logs_written.count,count,,,,[OpenMetrics V2] Count of GRPC Access Logs written,-1,envoy,,
2 changes: 2 additions & 0 deletions envoy/tests/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,4 +380,6 @@
"cluster.internal.upstream_rq_xx.count",
"cluster.http2.keepalive_timeout.count",
"cluster.upstream_rq_xx.count",
"access_logs.grpc_access_log.logs_written.count",
"access_logs.grpc_access_log.logs_dropped.count",
}
2 changes: 2 additions & 0 deletions envoy/tests/fixtures/multiple_services
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4574,3 +4574,5 @@ wasm.envoy.wasm.runtime.null.created: 0
wasm_vm.envoy.wasm.runtime.null.active: 0
wasm_vm.envoy.wasm.runtime.null.cloned: 0
wasm_vm.envoy.wasm.runtime.null.created: 0
access_logs.grpc_access_log.logs_dropped: 5
access_logs.grpc_access_log.logs_written: 10