diff --git a/.gitattributes b/.gitattributes index c4890f9d7..39810cae7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -examples/** linguist-generated=true -examples/README.md linguist-generated=false -examples/**/README.md linguist-generated=false -examples/**/values.yaml linguist-generated=false +charts/**/docs/examples/** linguist-generated=true +charts/**/docs/examples/README.md linguist-generated=false +charts/**/docs/examples/**/README.md linguist-generated=false +charts/**/docs/examples/**/values.yaml linguist-generated=false diff --git a/.github/workflows/helm-release-v1.yml b/.github/workflows/helm-release-v1.yml index a6a4dcc7e..62ae45bdd 100644 --- a/.github/workflows/helm-release-v1.yml +++ b/.github/workflows/helm-release-v1.yml @@ -9,7 +9,7 @@ env: CR_INDEX_PATH: "${{ github.workspace }}/.cr-index" CR_PACKAGE_PATH: "${{ github.workspace }}/.cr-release-packages" CR_TOOL_PATH: "${{ github.workspace }}/.cr-tool" - CR_VERSION: "1.5.0" + CR_VERSION: "1.6.1" jobs: setup: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..cefc54c11 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,123 @@ +--- +name: Release Helm chart +# yamllint disable-line rule:truthy +on: + workflow_dispatch: + +env: + BIN_PATH: bin + PACKAGE_PATH: package + INDEX_PATH: index + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout grafana/k8s-monitoring-helm + uses: actions/checkout@v4 + with: + fetch-depth: 0 + path: source + + - name: Checkout grafana/helm-charts + uses: actions/checkout@v4 + with: + fetch-depth: 0 + repository: grafana/helm-charts + path: helm-charts + token: "${{ secrets.GH_BOT_ACCESS_TOKEN }}" + + - name: Set up Helm + uses: azure/setup-helm@v4 + + - name: Install CR tool + run: | + mkdir "${BIN_PATH}" + mkdir "${PACKAGE_PATH}" + mkdir "${INDEX_PATH}" + crVersion=$(gh release list --repo helm/chart-releaser --exclude-pre-releases --json tagName --jq '.[0].tagName' | sed 's/v//') + curl -sSLo cr.tar.gz "https://github.com/helm/chart-releaser/releases/download/v${crVersion}/chart-releaser_${crVersion}_linux_amd64.tar.gz" + tar -xzf cr.tar.gz -C "${BIN_PATH}" + rm -f cr.tar.gz + + - name: Configure Git + run: | + cd source + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + cd ../helm-charts + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Parse Chart.yaml + id: parse-chart + working-directory: source + run: | + name="$(yq ".name" charts/k8s-monitoring/Chart.yaml)" + version="$(yq ".version" charts/k8s-monitoring/Chart.yaml)" + + { + echo "description=$(yq ".description" charts/k8s-monitoring/Chart.yaml)" + echo "version=${version}" + echo "tagVersion=v${version}" + echo "packageName=${name}-${version}" + } >> "${GITHUB_OUTPUT}" + + - name: Parse version + id: parse-version + uses: booxmedialtd/ws-action-parse-semver@v1 + with: + input_string: ${{ steps.parse-chart.outputs.version }} + + - name: Create Helm package + working-directory: source + run: | + helm repo add grafana https://grafana.github.io/helm-charts + helm repo add kepler https://sustainable-computing-io.github.io/kepler-helm-chart + helm repo add opencost https://opencost.github.io/opencost-helm-chart + helm repo add prometheus-community https://prometheus-community.github.io/helm-charts + helm package charts/k8s-monitoring --destination "../${PACKAGE_PATH}" + + - name: Create release on grafana/k8s-monitoring-helm + uses: softprops/action-gh-release@v2 + with: + name: ${{ steps.parse-chart.outputs.tagVersion }} + repository: grafana/k8s-monitoring-helm + tag_name: ${{ steps.parse-chart.outputs.tagVersion }} + prerelease: ${{ steps.parse-version.outputs.prerelease != '' }} + token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} + generate_release_notes: true + files: ${{ env.PACKAGE_PATH }}/${{ steps.parse-chart.outputs.packagename }}.tgz + fail_on_unmatched_files: true + + # Note that this creates a release in grafana/helm-charts GitHub Repository with a new tag. + # The tag name in grafana/helm-charts is -, while the + # tag name for grafana/k8s-monitoring-helm is . + - name: Create release on grafana/helm-charts + uses: softprops/action-gh-release@v2 + with: + name: ${{ steps.parse-chart.outputs.packagename }} + repository: grafana/helm-charts + tag_name: ${{ steps.parse-chart.outputs.packagename }} + prerelease: ${{ steps.parse-version.outputs.prerelease != '' }} + token: ${{ secrets.GH_BOT_ACCESS_TOKEN }} + body: | + ${{ steps.parse-chart.outputs.desc }} + + Source commit: https://github.com/${{ github.repository }}/commit/${{ github.sha }} + + Tag on source: https://github.com/${{ github.repository }}/releases/tag/${{ steps.parse-chart.outputs.tagname }} + files: ${{ env.PACKAGE_PATH }}/${{ steps.parse-chart.outputs.packagename }}.tgz + fail_on_unmatched_files: true + + - name: Update Helm repository index + working-directory: helm-charts + env: + CR_OWNER: grafana + CR_GIT_REPO: helm-charts + CR_PACKAGE_PATH: ${{ env.PACKAGE_PATH }} + CR_SKIP_EXISTING: true + CR_TOKEN: ${{ secrets.GH_BOT_ACCESS_TOKEN }} + run: | + "${BIN_PATH}/cr" index --index-path "${INDEX_PATH}" --push diff --git a/charts/k8s-monitoring/Chart.yaml b/charts/k8s-monitoring/Chart.yaml index dbfd8f1ac..38e439802 100644 --- a/charts/k8s-monitoring/Chart.yaml +++ b/charts/k8s-monitoring/Chart.yaml @@ -6,7 +6,7 @@ type: application icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_icon.svg sources: - https://github.com/grafana/k8s-monitoring-helm/tree/main/charts/k8s-monitoring -version: 2.0.0-alpha.1 +version: 2.0.0-rc.1 appVersion: 2.0.0 maintainers: - email: pete.wall@grafana.com diff --git a/charts/k8s-monitoring/README.md b/charts/k8s-monitoring/README.md index f9437e8ea..c613d6da5 100644 --- a/charts/k8s-monitoring/README.md +++ b/charts/k8s-monitoring/README.md @@ -5,7 +5,7 @@ # k8s-monitoring -![Version: 2.0.0-alpha.1](https://img.shields.io/badge/Version-2.0.0--alpha.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) +![Version: 2.0.0-rc.1](https://img.shields.io/badge/Version-2.0.0--rc.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) Capture all telemetry data from your Kubernetes cluster. diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz index aaf88746b..10894ccaa 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-annotation-autodiscovery-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz index 7142436d0..bb5503a50 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-application-observability-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz index de52698ea..4b0532a52 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-events-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz index a44bf3536..6b5e7a7eb 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-cluster-metrics-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz index 574f0f715..1ba332c76 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-integrations-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz index 861be9a02..7ea1673e7 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-pod-logs-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz index dda58c36a..51c895ad4 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-profiling-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz b/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz index e6cd55c47..827306b24 100644 Binary files a/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz and b/charts/k8s-monitoring/charts/k8s-monitoring-feature-prometheus-operator-objects-1.0.0.tgz differ diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml index 99edab395..165a513a9 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml @@ -209,7 +209,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml index 9a3f70e8a..d194febfb 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml @@ -194,7 +194,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml index e9198dda9..8d69d1cad 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml @@ -202,7 +202,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml b/charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml index ad36213cc..e0d660960 100644 --- a/charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/sigv4/output.yaml @@ -413,7 +413,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/autoscaling/output.yaml b/charts/k8s-monitoring/docs/examples/autoscaling/output.yaml index 5b09065af..0b6a02da9 100644 --- a/charts/k8s-monitoring/docs/examples/autoscaling/output.yaml +++ b/charts/k8s-monitoring/docs/examples/autoscaling/output.yaml @@ -389,7 +389,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml b/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml index 7f8bf4bb2..9448270e8 100644 --- a/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml +++ b/charts/k8s-monitoring/docs/examples/collector-storage/output.yaml @@ -405,7 +405,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml b/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml index 035324457..6b3ae3d9d 100644 --- a/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml +++ b/charts/k8s-monitoring/docs/examples/extra-rules/output.yaml @@ -550,7 +550,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/output.yaml index 610b7ad41..aab0aa52e 100644 --- a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/default/output.yaml @@ -313,7 +313,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="annotationAutodiscovery", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/prom-annotations/output.yaml b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/prom-annotations/output.yaml index e631bd882..9ad66ae97 100644 --- a/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/prom-annotations/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/annotation-autodiscovery/prom-annotations/output.yaml @@ -313,7 +313,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="annotationAutodiscovery", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml index d7fe65a5f..8ffda5c4e 100644 --- a/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/applicaiton-observability/default/output.yaml @@ -228,7 +228,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml index 809bf7880..4f0eb8aba 100644 --- a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/control-plane-monitoring/output.yaml @@ -640,7 +640,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="controlPlane,kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/default/output.yaml index 11b48db6d..d5c8dc555 100644 --- a/charts/k8s-monitoring/docs/examples/features/cluster-metrics/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/cluster-metrics/default/output.yaml @@ -389,7 +389,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml index a11870c3f..73030fba9 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/integrations/alloy/output.yaml @@ -403,7 +403,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="integrations", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/cert-manager/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/cert-manager/output.yaml index de5e5721d..b8dad397e 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/cert-manager/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/integrations/cert-manager/output.yaml @@ -144,7 +144,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="integrations", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/etcd/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/etcd/output.yaml index 606ea2219..b7939c56d 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/etcd/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/integrations/etcd/output.yaml @@ -143,7 +143,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="integrations", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml index de8394ac2..56aaf6a27 100644 --- a/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml @@ -157,7 +157,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="prometheusOperatorObjects", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml b/charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml index c272a9a31..993579574 100644 --- a/charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml +++ b/charts/k8s-monitoring/docs/examples/metrics-tuning/output.yaml @@ -600,7 +600,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="annotationAutodiscovery", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml index 07cb3f321..7ab34a4c2 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml +++ b/charts/k8s-monitoring/docs/examples/platforms/azure-aks/output.yaml @@ -501,7 +501,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml index 06ffdfe60..27ecd5901 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml +++ b/charts/k8s-monitoring/docs/examples/platforms/eks-fargate/output.yaml @@ -451,7 +451,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml index 338aeea15..8177d7cbe 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml +++ b/charts/k8s-monitoring/docs/examples/platforms/gke-autopilot/output.yaml @@ -451,7 +451,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml b/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml index cf4588ec6..c2a1a5a54 100644 --- a/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml +++ b/charts/k8s-monitoring/docs/examples/platforms/openshift/output.yaml @@ -555,7 +555,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform="openshift"} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform="openshift"} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter,kepler", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter,kepler", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml b/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml index bc58c1a06..581bae021 100644 --- a/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml +++ b/charts/k8s-monitoring/docs/examples/private-image-registries/output.yaml @@ -411,7 +411,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{deployments="kube-state-metrics,node-exporter,windows-exporter", feature="clusterMetrics", sources="kubelet,kubeletResource,cadvisor,kube-state-metrics,node-exporter,windows-exporter", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/proxies/output.yaml b/charts/k8s-monitoring/docs/examples/proxies/output.yaml index 1b4c8d48e..d9892d5a2 100644 --- a/charts/k8s-monitoring/docs/examples/proxies/output.yaml +++ b/charts/k8s-monitoring/docs/examples/proxies/output.yaml @@ -535,7 +535,7 @@ data: self-reporting-metric.prom: | # HELP grafana_kubernetes_monitoring_build_info A metric to report the version of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_build_info gauge - grafana_kubernetes_monitoring_build_info{version="2.0.0-alpha.1", namespace="default", platform=""} 1 + grafana_kubernetes_monitoring_build_info{version="2.0.0-rc.1", namespace="default", platform=""} 1 # HELP grafana_kubernetes_monitoring_feature_info A metric to report the enabled features of the Kubernetes Monitoring Helm chart # TYPE grafana_kubernetes_monitoring_feature_info gauge grafana_kubernetes_monitoring_feature_info{feature="applicationObservability", protocols="otlpgrpc", version="1.0.0"} 1 diff --git a/charts/k8s-monitoring/docs/examples/remote-config/README.md b/charts/k8s-monitoring/docs/examples/remote-config/README.md index bb533ddfd..38056c78e 100644 --- a/charts/k8s-monitoring/docs/examples/remote-config/README.md +++ b/charts/k8s-monitoring/docs/examples/remote-config/README.md @@ -7,6 +7,7 @@ ## Values ```yaml +--- cluster: name: remote-config-example-cluster diff --git a/charts/k8s-monitoring/docs/examples/remote-config/values.yaml b/charts/k8s-monitoring/docs/examples/remote-config/values.yaml index 326a8b4f2..2b56be0b0 100644 --- a/charts/k8s-monitoring/docs/examples/remote-config/values.yaml +++ b/charts/k8s-monitoring/docs/examples/remote-config/values.yaml @@ -1,3 +1,4 @@ +--- cluster: name: remote-config-example-cluster