Skip to content

Commit 95867b7

Browse files
odubajDTodubajDT
committed
adapt naming
Signed-off-by: odubajDT <[email protected]>
1 parent 67ca876 commit 95867b7

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎.chloggen/add-k8s-allocatable-metrics.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ change_type: enhancement
1010
component: k8s
1111

1212
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13-
note: Add `k8s.node.allocatable_cpu`, `k8s.node.allocatable_ephemeral_storage`, `k8s.node.allocatable_memory`, `k8s.node.allocatable_pods` metrics
13+
note: Add `k8s.node.allocatable.cpu`, `k8s.node.allocatable.ephemeral_storage`, `k8s.node.allocatable.memory`, `k8s.node.allocatable.pods` metrics
1414

1515
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
1616
# The values here must be integers.

‎docs/system/k8s-metrics.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ and therefore inherit its attributes, like `k8s.pod.name` and `k8s.pod.uid`.
2929
- [Metric: `k8s.container.status.reason`](#metric-k8scontainerstatusreason)
3030
- [Node metrics](#node-metrics)
3131
- [Metric: `k8s.node.uptime`](#metric-k8snodeuptime)
32-
- [Metric: `k8s.node.allocatable_cpu`](#metric-k8snodeallocatable_cpu)
33-
- [Metric: `k8s.node.allocatable_memory`](#metric-k8snodeallocatable_memory)
34-
- [Metric: `k8s.node.allocatable_ephemeral_storage`](#metric-k8snodeallocatable_ephemeral_storage)
35-
- [Metric: `k8s.node.allocatable_pods`](#metric-k8snodeallocatable_pods)
32+
- [Metric: `k8s.node.allocatable.cpu`](#metric-k8snodeallocatablecpu)
33+
- [Metric: `k8s.node.allocatable.memory`](#metric-k8snodeallocatablememory)
34+
- [Metric: `k8s.node.allocatable.ephemeral_storage`](#metric-k8snodeallocatableephemeral_storage)
35+
- [Metric: `k8s.node.allocatable.pods`](#metric-k8snodeallocatablepods)
3636
- [Metric: `k8s.node.cpu.time`](#metric-k8snodecputime)
3737
- [Metric: `k8s.node.cpu.usage`](#metric-k8snodecpuusage)
3838
- [Metric: `k8s.node.memory.usage`](#metric-k8snodememoryusage)
@@ -358,11 +358,11 @@ The actual accuracy would depend on the instrumentation and operating system.
358358
<!-- END AUTOGENERATED TEXT -->
359359
<!-- endsemconv -->
360360

361-
### Metric: `k8s.node.allocatable_cpu`
361+
### Metric: `k8s.node.allocatable.cpu`
362362

363363
This metric is [recommended][MetricRecommended].
364364

365-
<!-- semconv metric.k8s.node.allocatable_cpu -->
365+
<!-- semconv metric.k8s.node.allocatable.cpu -->
366366
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
367367
<!-- see templates/registry/markdown/snippet.md.j2 -->
368368
<!-- prettier-ignore-start -->
@@ -371,18 +371,18 @@ This metric is [recommended][MetricRecommended].
371371

372372
| Name | Instrument Type | Unit (UCUM) | Description | Stability | Entity Associations |
373373
| -------- | --------------- | ----------- | -------------- | --------- | ------ |
374-
| `k8s.node.allocatable_cpu` | Gauge | `{cpu}` | Amount of cpu allocatable on the node | ![Development](https://img.shields.io/badge/-development-blue) | |
374+
| `k8s.node.allocatable.cpu` | UpDownCounter | `{cpu}` | Amount of cpu allocatable on the node | ![Development](https://img.shields.io/badge/-development-blue) | |
375375

376376
<!-- markdownlint-restore -->
377377
<!-- prettier-ignore-end -->
378378
<!-- END AUTOGENERATED TEXT -->
379379
<!-- endsemconv -->
380380

381-
### Metric: `k8s.node.allocatable_memory`
381+
### Metric: `k8s.node.allocatable.memory`
382382

383383
This metric is [recommended][MetricRecommended].
384384

385-
<!-- semconv metric.k8s.node.allocatable_memory -->
385+
<!-- semconv metric.k8s.node.allocatable.memory -->
386386
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
387387
<!-- see templates/registry/markdown/snippet.md.j2 -->
388388
<!-- prettier-ignore-start -->
@@ -391,18 +391,18 @@ This metric is [recommended][MetricRecommended].
391391

392392
| Name | Instrument Type | Unit (UCUM) | Description | Stability | Entity Associations |
393393
| -------- | --------------- | ----------- | -------------- | --------- | ------ |
394-
| `k8s.node.allocatable_memory` | Gauge | `By` | Amount of memory allocatable on the node | ![Development](https://img.shields.io/badge/-development-blue) | |
394+
| `k8s.node.allocatable.memory` | UpDownCounter | `By` | Amount of memory allocatable on the node | ![Development](https://img.shields.io/badge/-development-blue) | |
395395

396396
<!-- markdownlint-restore -->
397397
<!-- prettier-ignore-end -->
398398
<!-- END AUTOGENERATED TEXT -->
399399
<!-- endsemconv -->
400400

401-
### Metric: `k8s.node.allocatable_ephemeral_storage`
401+
### Metric: `k8s.node.allocatable.ephemeral_storage`
402402

403403
This metric is [recommended][MetricRecommended].
404404

405-
<!-- semconv metric.k8s.node.allocatable_ephemeral_storage -->
405+
<!-- semconv metric.k8s.node.allocatable.ephemeral_storage -->
406406
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
407407
<!-- see templates/registry/markdown/snippet.md.j2 -->
408408
<!-- prettier-ignore-start -->
@@ -411,18 +411,18 @@ This metric is [recommended][MetricRecommended].
411411

412412
| Name | Instrument Type | Unit (UCUM) | Description | Stability | Entity Associations |
413413
| -------- | --------------- | ----------- | -------------- | --------- | ------ |
414-
| `k8s.node.allocatable_ephemeral_storage` | Gauge | `By` | Amount of ephemeral-storage allocatable on the node | ![Development](https://img.shields.io/badge/-development-blue) | |
414+
| `k8s.node.allocatable.ephemeral_storage` | UpDownCounter | `By` | Amount of ephemeral-storage allocatable on the node | ![Development](https://img.shields.io/badge/-development-blue) | |
415415

416416
<!-- markdownlint-restore -->
417417
<!-- prettier-ignore-end -->
418418
<!-- END AUTOGENERATED TEXT -->
419419
<!-- endsemconv -->
420420

421-
### Metric: `k8s.node.allocatable_pods`
421+
### Metric: `k8s.node.allocatable.pods`
422422

423423
This metric is [recommended][MetricRecommended].
424424

425-
<!-- semconv metric.k8s.node.allocatable_pods -->
425+
<!-- semconv metric.k8s.node.allocatable.pods -->
426426
<!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
427427
<!-- see templates/registry/markdown/snippet.md.j2 -->
428428
<!-- prettier-ignore-start -->
@@ -431,7 +431,7 @@ This metric is [recommended][MetricRecommended].
431431

432432
| Name | Instrument Type | Unit (UCUM) | Description | Stability | Entity Associations |
433433
| -------- | --------------- | ----------- | -------------- | --------- | ------ |
434-
| `k8s.node.allocatable_pods` | Gauge | `{pod}` | Amount of pods allocatable on the node | ![Development](https://img.shields.io/badge/-development-blue) | |
434+
| `k8s.node.allocatable.pods` | UpDownCounter | `{pod}` | Amount of pods allocatable on the node | ![Development](https://img.shields.io/badge/-development-blue) | |
435435

436436
<!-- markdownlint-restore -->
437437
<!-- prettier-ignore-end -->

‎model/k8s/metrics.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,33 +102,33 @@ groups:
102102
The actual accuracy would depend on the instrumentation and operating system.
103103
instrument: gauge
104104
unit: "s"
105-
- id: metric.k8s.node.allocatable_cpu
105+
- id: metric.k8s.node.allocatable.cpu
106106
type: metric
107-
metric_name: k8s.node.allocatable_cpu
107+
metric_name: k8s.node.allocatable.cpu
108108
stability: development
109109
brief: "Amount of cpu allocatable on the node"
110-
instrument: gauge
110+
instrument: updowncounter
111111
unit: "{cpu}"
112-
- id: metric.k8s.node.allocatable_ephemeral_storage
112+
- id: metric.k8s.node.allocatable.ephemeral_storage
113113
type: metric
114-
metric_name: k8s.node.allocatable_ephemeral_storage
114+
metric_name: k8s.node.allocatable.ephemeral_storage
115115
stability: development
116116
brief: "Amount of ephemeral-storage allocatable on the node"
117-
instrument: gauge
117+
instrument: updowncounter
118118
unit: "By"
119-
- id: metric.k8s.node.allocatable_memory
119+
- id: metric.k8s.node.allocatable.memory
120120
type: metric
121-
metric_name: k8s.node.allocatable_memory
121+
metric_name: k8s.node.allocatable.memory
122122
stability: development
123123
brief: "Amount of memory allocatable on the node"
124-
instrument: gauge
124+
instrument: updowncounter
125125
unit: "By"
126-
- id: metric.k8s.node.allocatable_pods
126+
- id: metric.k8s.node.allocatable.pods
127127
type: metric
128-
metric_name: k8s.node.allocatable_pods
128+
metric_name: k8s.node.allocatable.pods
129129
stability: development
130130
brief: "Amount of pods allocatable on the node"
131-
instrument: gauge
131+
instrument: updowncounter
132132
unit: "{pod}"
133133
# k8s.node.cpu.* metrics
134134
- id: metric.k8s.node.cpu.time

0 commit comments

Comments
 (0)