Skip to content

Commit

Permalink
fix: Replace kube_daemonset_labels and kube_statefulset_labels with _…
Browse files Browse the repository at this point in the history
…created metric
  • Loading branch information
tiithansen committed Jun 7, 2024
1 parent 40074d1 commit 0138fb1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
8 changes: 4 additions & 4 deletions src/metrics/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ export const Metrics = {
}
},
// StatefulSets
kubeStatefulsetLabels: {
name: 'kube_statefulset_labels',
kubeStatefulSetCreated: {
name: 'kube_statefulset_created',
labels:{
namespace: 'namespace',
statefulset: 'statefulset',
Expand Down Expand Up @@ -201,8 +201,8 @@ export const Metrics = {
}
},
// DaemonSets
kubeDaemonsetLabels: {
name: 'kube_daemonset_labels',
kubeDaemonSetCreated: {
name: 'kube_daemonset_created',
labels:{
namespace: 'namespace',
daemonset: 'daemonset',
Expand Down
8 changes: 4 additions & 4 deletions src/pages/Workloads/tabs/DaemonSets/DaemonSets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ const daemonSetsQueryRunner = new SceneQueryRunner({
refId: 'daemonsets',
expr: `
group(
${Metrics.kubeDaemonsetLabels.name}{
${Metrics.kubeDaemonSetCreated.name}{
cluster="$cluster",
${Metrics.kubeDaemonsetLabels.labels.namespace}=~"$namespace"
${Metrics.kubeDaemonSetCreated.labels.namespace}=~"$namespace"
}
) by (
${Metrics.kubeDaemonsetLabels.labels.daemonset},
${Metrics.kubeDaemonsetLabels.labels.namespace}
${Metrics.kubeDaemonSetCreated.labels.daemonset},
${Metrics.kubeDaemonSetCreated.labels.namespace}
)`,
instant: true,
format: 'table'
Expand Down
11 changes: 7 additions & 4 deletions src/pages/Workloads/tabs/StatefulSets/StatefulSets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,15 @@ const statefulSetsQueryRunner = new SceneQueryRunner({
refId: 'statefulsets',
expr: `
group(
${Metrics.kubeStatefulsetLabels.name}{
${Metrics.kubeStatefulSetCreated.name}{
cluster="$cluster",
${Metrics.kubeStatefulsetLabels.labels.namespace}=~"$namespace",
${Metrics.kubeStatefulsetLabels.labels.statefulset}=~".*$search.*"
${Metrics.kubeStatefulSetCreated.labels.namespace}=~"$namespace",
${Metrics.kubeStatefulSetCreated.labels.statefulset}=~".*$search.*"
}
) by (${Metrics.kubeStatefulsetLabels.labels.statefulset}, ${Metrics.kubeStatefulsetLabels.labels.namespace})`,
) by (
${Metrics.kubeStatefulSetCreated.labels.statefulset},
${Metrics.kubeStatefulSetCreated.labels.namespace}
)`,
instant: true,
format: 'table'
},
Expand Down

0 comments on commit 0138fb1

Please sign in to comment.