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

Jump to bottom

exporter: add namespace to internal metric label #684

Merged
merged 2 commits into from Jul 24, 2023
Merged

exporter: add namespace to internal metric label #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fd2e1e
exporter: add namespace to internal metric label
ridwanmsharif Jul 22, 2023
8fb73ed
fix linting error
ridwanmsharif Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion exporter/collector/googlemanagedprometheus/extra_metrics.go
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ import (
const (
// Special attribute key used by Ops Agent prometheus receiver to denote untyped
// prometheus metric. Internal use only.
GCPOpsAgentUntypedMetricKey = "prometheus_untyped_metric"
GCPOpsAgentUntypedMetricKey = "prometheus.googleapis.com/internal/untyped_metric"

gcpUntypedDoubleExportGateKey = "gcp.untyped_double_export"
)
Expand Down
92 changes: 46 additions & 46 deletions exporter/collector/integrationtest/testdata/fixtures/metrics/untyped_gauge.json
View file
Open in desktop
@@ -1,61 +1,61 @@
{
"resourceMetrics":[
{
"resourceMetrics": [
{
"resource": {
"attributes": [
{
"key": "cloud.availability_zone",
"value": {
"stringValue": "us-central1-c"
"attributes": [
{
"key": "cloud.availability_zone",
"value": {
"stringValue": "us-central1-c"
}
},
{
"key": "service.name",
"value": {
"stringValue": "demo"
}
},
{
"key": "service.instance.id",
"value": {
"stringValue": "10.92.5.2:15692"
}
}
},
{
"key": "service.name",
"value": {
"stringValue": "demo"
}
},
{
"key": "service.instance.id",
"value": {
"stringValue": "10.92.5.2:15692"
}
}
]
]
},
"scopeMetrics":[
{
"scope":{},
"metrics":[
{
"name":"fake_untyped_metric",
"gauge":{
"dataPoints":[
"scopeMetrics": [
{
"scope": {},
"metrics": [
{
"name": "fake_untyped_metric",
"gauge": {
"dataPoints": [
{
"attributes":[
"attributes": [
{
"key":"ex_com_lemons_untyped",
"value":{
"stringValue":"13"
"key": "ex_com_lemons_untyped",
"value": {
"stringValue": "13"
}
},
{
"key":"prometheus_untyped_metric",
"value":{
"stringValue":"true"
"key": "prometheus.googleapis.com/internal/untyped_metric",
"value": {
"stringValue": "true"
}
}
],
"startTimeUnixNano":"1649443416286000000",
"timeUnixNano":"1649443516286000000",
"asDouble":3
"startTimeUnixNano": "1649443416286000000",
"timeUnixNano": "1649443516286000000",
"asDouble": 3
}
]
}
}
]
}
]
}
]
}
}
]
}
]
}
]
}
4 changes: 2 additions & 2 deletions exporter/collector/integrationtest/testdata/fixtures/metrics/untyped_gauge_expect.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"type": "workload.googleapis.com/fake_untyped_metric",
"labels": {
"ex_com_lemons_untyped": "13",
"prometheus_untyped_metric": "true"
"prometheus_googleapis_com_internal_untyped_metric": "true"
}
},
"resource": {
Expand Down Expand Up @@ -47,7 +47,7 @@
"key": "ex_com_lemons_untyped"
},
{
"key": "prometheus_untyped_metric"
"key": "prometheus_googleapis_com_internal_untyped_metric"
}
],
"metricKind": "GAUGE",
Expand Down