Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
348 changes: 317 additions & 31 deletions apps/grafana/crds.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -731,4 +731,4 @@ data:
k8s-monitoring-build-info-metric.prom: |
# HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart as well as a summary of enabled features
# TYPE grafana_kubernetes_monitoring_build_info gauge
grafana_kubernetes_monitoring_build_info{version="1.6.52", namespace="grafana", metrics="enabled,alloy,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor", logs="enabled,events,pod_logs,journal,extraConfig", traces="enabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
grafana_kubernetes_monitoring_build_info{version="1.6.54", namespace="grafana", metrics="enabled,alloy,kube-state-metrics,node-exporter,kubelet,kubeletResource,cadvisor", logs="enabled,events,pod_logs,journal,extraConfig", traces="enabled", deployments="kube-state-metrics,prometheus-node-exporter,prometheus-operator-crds"} 1
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
mountPath: /var/log
readOnly: true
- name: config-reloader
image: quay.io/prometheus-operator/prometheus-config-reloader:v0.81.0
image: quay.io/prometheus-operator/prometheus-config-reloader:v0.91.0@sha256:7d9e4eea5f1139e602508871f422b0116c60e87c662f3dcd234d5ab60cd0d8c1
imagePullPolicy: IfNotPresent
args:
- --watched-dir=/etc/alloy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
- name: config
mountPath: /etc/alloy
- name: config-reloader
image: quay.io/prometheus-operator/prometheus-config-reloader:v0.81.0
image: quay.io/prometheus-operator/prometheus-config-reloader:v0.91.0@sha256:7d9e4eea5f1139e602508871f422b0116c60e87c662f3dcd234d5ab60cd0d8c1
imagePullPolicy: IfNotPresent
args:
- --watched-dir=/etc/alloy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
- --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpointslices,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments
- --metric-labels-allowlist=nodes=[agentpool,alpha.eksctl.io/cluster-name,alpha.eksctl.io/nodegroup-name,beta.kubernetes.io/instance-type,cloud.google.com/gke-nodepool,cluster_name,ec2_amazonaws_com_Name,ec2_amazonaws_com_aws_autoscaling_groupName,ec2_amazonaws_com_aws_autoscaling_group_name,ec2_amazonaws_com_name,eks_amazonaws_com_nodegroup,k8s_io_cloud_provider_aws,karpenter.sh/nodepool,kubernetes.azure.com/cluster,kubernetes.io/arch,kubernetes.io/hostname,kubernetes.io/os,node.kubernetes.io/instance-type,topology.kubernetes.io/region,topology.kubernetes.io/zone]
imagePullPolicy: IfNotPresent
image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.18.0
image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.19.0
ports:
- containerPort: 8080
name: http
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
kubernetes.io/os: linux
containers:
- name: query-test
image: ghcr.io/grafana/k8s-monitoring-test:1.6.52
image: ghcr.io/grafana/k8s-monitoring-test:1.6.54
command: ["bash", "-c", "/etc/bin/query-test.sh /etc/test/testQueries.json"]
volumeMounts:
- name: test-files
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
kubernetes.io/os: linux
containers:
- name: config-analysis
image: ghcr.io/grafana/k8s-monitoring-test:1.6.52
image: ghcr.io/grafana/k8s-monitoring-test:1.6.54
command: [/etc/bin/config-analysis.sh]
env:
- name: ALLOY_HOST
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
- mountPath: /var/lib/agent
name: agent-wal
- name: config-reloader
image: quay.io/prometheus-operator/prometheus-config-reloader:v0.81.0
image: quay.io/prometheus-operator/prometheus-config-reloader:v0.91.0@sha256:7d9e4eea5f1139e602508871f422b0116c60e87c662f3dcd234d5ab60cd0d8c1
imagePullPolicy: IfNotPresent
args:
- --watched-dir=/etc/alloy
Expand Down
2 changes: 1 addition & 1 deletion apps/grafana/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
chart:
spec:
chart: k8s-monitoring
version: 1.6.52
version: 1.6.54
sourceRef:
kind: HelmRepository
name: grafana
Expand Down