Skip to content

Commit c9d8f14

Browse files
ChrsMarkChrsMark
authored
Add metrics for openshift's clusterquota (#2779)
Signed-off-by: ChrsMark <[email protected]>
1 parent 4f63823 commit c9d8f14

File tree

18 files changed

+1189
-6
lines changed

18 files changed

+1189
-6
lines changed

‎.chloggen/add_openshift_semconv.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Use this changelog template to create an entry for release notes.
2+
#
3+
# If your change doesn't affect end users you should instead start
4+
# your pull request title with [chore] or use the "Skip Changelog" label.
5+
6+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
7+
change_type: enhancement
8+
9+
# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
10+
component: openshift
11+
12+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
13+
note: Adds metrics for openshift's clusterquota
14+
15+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
16+
# The values here must be integers.
17+
issues: [2078]
18+
19+
# (Optional) One or more lines of additional information to render under the primary note.
20+
# These lines will be padded with 2 spaces and then inserted directly into the document.
21+
# Use pipe (|) for multiline entries.
22+
subtext:

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@
7979
/model/session/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-client-approvers
8080

8181
# K8s semantic conventions
82-
/docs/resource/k8s.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
82+
/docs/resource/k8s/k8s.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
83+
/docs/resource/k8s/openshift.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
8384
/model/k8s/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
8485
/docs/non-normative/k8s-attributes.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
8586
/docs/non-normative/k8s-migration.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers

‎.github/ISSUE_TEMPLATE/bug_report.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ body:
7676
- area:oci
7777
- area:onc-rpc
7878
- area:openai
79+
- area:openshift
7980
- area:opentracing
8081
- area:os
8182
- area:otel

‎.github/ISSUE_TEMPLATE/change_proposal.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ body:
6868
- area:oci
6969
- area:onc-rpc
7070
- area:openai
71+
- area:openshift
7172
- area:opentracing
7273
- area:os
7374
- area:otel

‎.github/ISSUE_TEMPLATE/new-conventions.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ body:
7979
- area:oci
8080
- area:onc-rpc
8181
- area:openai
82+
- area:openshift
8283
- area:opentracing
8384
- area:os
8485
- area:otel

‎docs/non-normative/k8s-migration.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ and one for disabling the old schema called `semconv.k8s.disableLegacy`. Then:
6060
- [K8s ReplicationController resource](#k8s-replicationcontroller-resource)
6161
- [K8s Container metrics](#k8s-container-metrics)
6262
- [K8s ResourceQuota metrics](#k8s-resourcequota-metrics)
63+
- [OpenShift ClusterResourceQuota metrics](#openshift-clusterresourcequota-metrics)
6364
- [K8s Node condition metrics](#k8s-node-condition-metrics)
6465
- [K8s Filesystem metrics](#k8s-filesystem-metrics)
6566
- [K8s Pod Volume metrics](#k8s-pod-volume-metrics)
@@ -363,6 +364,25 @@ These metrics were completely re-designed. The changes are the following:
363364

364365
<!-- prettier-ignore-end -->
365366

367+
### OpenShift ClusterResourceQuota metrics
368+
369+
The OpenShift ClusterResourceQuota metrics implemented by the Collector and specifically the
370+
[k8scluster](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.115.0/receiver/k8sclusterreceiver/documentation.md)
371+
receiver were introduced as semantic conventions in
372+
[github.com/open-telemetry/semantic-conventions/pull/2779](https://github.com/open-telemetry/semantic-conventions/pull/2779).
373+
374+
These metrics were completely re-designed. The changes are the following:
375+
376+
<!-- prettier-ignore-start -->
377+
378+
| Old (Collector) ![changed](https://img.shields.io/badge/changed-orange?style=flat) | New |
379+
|------------------------------------------------------------------------------------|-------------------------------------|
380+
| `openshift.clusterquota.hard_limit` | `openshift.clusterquota.{resource}.hard` |
381+
| `openshift.clusterquota.used` | `openshift.clusterquota.{resource}.used` |
382+
| `{resource}` attribute | Split in different metrics per type |
383+
384+
<!-- prettier-ignore-end -->
385+
366386
### K8s Node condition metrics
367387

368388
The K8s Node condition metrics implemented by the Collector and specifically the

‎docs/registry/attributes/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Currently, the following namespaces exist:
8585
- [OCI](oci.md)
8686
- [ONC RPC](onc-rpc.md)
8787
- [OpenAI](openai.md)
88+
- [Openshift](openshift.md)
8889
- [OpenTracing](opentracing.md)
8990
- [OS](os.md)
9091
- [OTel](otel.md)

‎docs/registry/attributes/openshift.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- NOTE: THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
2+
<!-- see templates/registry/markdown/attribute_namespace.md.j2 -->
3+
4+
# Openshift
5+
6+
## Openshift Attributes
7+
8+
OpenShift resource attributes.
9+
10+
| Attribute | Type | Description | Examples | Stability |
11+
|---|---|---|---|---|
12+
| <a id="openshift-clusterquota-name" href="#openshift-clusterquota-name">`openshift.clusterquota.name`</a> | string | The name of the cluster quota. | `opentelemetry` | ![Development](https://img.shields.io/badge/-development-blue) |
13+
| <a id="openshift-clusterquota-uid" href="#openshift-clusterquota-uid">`openshift.clusterquota.uid`</a> | string | The UID of the cluster quota. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | ![Development](https://img.shields.io/badge/-development-blue) |

‎docs/registry/entities/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ Currently, the following namespaces exist:
7777
| | [k8s.replicationcontroller](k8s.md#k8s-replicationcontroller) | ![Development](https://img.shields.io/badge/-development-blue) |
7878
| | [k8s.resourcequota](k8s.md#k8s-resourcequota) | ![Development](https://img.shields.io/badge/-development-blue) |
7979
| | [k8s.statefulset](k8s.md#k8s-statefulset) | ![Development](https://img.shields.io/badge/-development-blue) |
80+
| Openshift | | |
81+
| | [openshift.clusterquota](openshift.md#openshift-clusterquota) | ![Development](https://img.shields.io/badge/-development-blue) |
8082
| OS | | |
8183
| | [os](os.md#os) | ![Development](https://img.shields.io/badge/-development-blue) |
8284
| OTel | | |

‎docs/registry/entities/openshift.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!-- NOTE: THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
2+
<!-- see templates/registry/markdown/entity_namespace.md.j2 -->
3+
<!-- markdownlint-capture -->
4+
<!-- markdownlint-disable -->
5+
6+
# Openshift
7+
8+
## Openshift Clusterquota
9+
10+
**Status:** ![Development](https://img.shields.io/badge/-development-blue)
11+
12+
**type:** `openshift.clusterquota`
13+
14+
**Description:** An OpenShift [ClusterResourceQuota](https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html/schedule_and_quota_apis/clusterresourcequota-quota-openshift-io-v1#clusterresourcequota-quota-openshift-io-v1) object.
15+
16+
**Identifying Attributes:**
17+
18+
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
19+
|---|---|---|---|---|---|
20+
| [`openshift.clusterquota.uid`](/docs/registry/attributes/openshift.md) | string | The UID of the cluster quota. | `275ecb36-5aa8-4c2a-9c47-d8bb681b9aff` | `Recommended` | ![Development](https://img.shields.io/badge/-development-blue) |
21+
22+
**Descriptive Attributes:**
23+
24+
| Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability |
25+
|---|---|---|---|---|---|
26+
| [`openshift.clusterquota.name`](/docs/registry/attributes/openshift.md) | string | The name of the cluster quota. | `opentelemetry` | `Recommended` | ![Development](https://img.shields.io/badge/-development-blue) |
27+
28+
29+
<!-- markdownlint-restore -->

0 commit comments

Comments
 (0)