diff --git a/README.md b/README.md index f047abf4e..740bbe43d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -![Builds on main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event=push) ![PRs to main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event!=push) +- **Main branch builds:** ![Builds on main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event=push) + +- **PR builds:** ![PRs to main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event!=push) + # Project diff --git a/otelcollector/README.md b/otelcollector/README.md index f14fd08ae..77343d6a6 100644 --- a/otelcollector/README.md +++ b/otelcollector/README.md @@ -1,4 +1,7 @@ -![Builds on main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event=push) ![PRs to main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event!=push) +- **Main branch builds:** ![Builds on main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event=push) + +- **PR builds:** ![PRs to main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event!=push) + # Build Instructions diff --git a/otelcollector/deploy/README.md b/otelcollector/deploy/README.md index 1c8d3bd87..b4dfa4420 100644 --- a/otelcollector/deploy/README.md +++ b/otelcollector/deploy/README.md @@ -1,4 +1,7 @@ -![Builds on main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event=push) ![PRs to main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event!=push) +- **Main branch builds:** ![Builds on main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event=push) + +- **PR builds:** ![PRs to main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event!=push) + # Deployment Instructions diff --git a/otelcollector/deploy/chart/prometheus-collector/README.md b/otelcollector/deploy/chart/prometheus-collector/README.md index 1be1289b6..a02662d78 100644 --- a/otelcollector/deploy/chart/prometheus-collector/README.md +++ b/otelcollector/deploy/chart/prometheus-collector/README.md @@ -1,8 +1,10 @@ -![Builds on main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event=push) ![PRs to main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event!=push) +- **Main branch builds:** ![Builds on main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event=push) + +- **PR builds:** ![PRs to main branch](https://github.com/Azure/prometheus-collector/actions/workflows/build-and-push-image-and-chart.yml/badge.svg?branch=main&event!=push) # prometheus-collector HELM chart -![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.2](https://img.shields.io/badge/AppVersion-0.0.2-informational?style=flat-square) +![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) A Helm chart for collecting Prometheus metrics in Kubernetes clusters and ingestion to Azure Metrics Account(s) @@ -45,8 +47,8 @@ helm install csi csi-secrets-store-provider-azure/csi-secrets-store-provider-azu - **Step 5** : Pull, Export & Install prometheus-collector chart in your cluster ```shell -helm chart pull mcr.microsoft.com/azuremonitor/containerinsights/cidev:prometheus-collector-chart-main-0.0.1-05-05-2021-4e51e2ce -helm chart export mcr.microsoft.com/azuremonitor/containerinsights/cidev:prometheus-collector-chart-main-0.0.1-05-05-2021-4e51e2ce . +helm chart pull mcr.microsoft.com/azuremonitor/containerinsights/cidev:prometheus-collector-chart-main-0.0.1-05-05-2021-b7122082 +helm chart export mcr.microsoft.com/azuremonitor/containerinsights/cidev:prometheus-collector-chart-main-0.0.1-05-05-2021-b7122082 . helm upgrade --install ./prometheus-collector --set azureKeyVault.name='**' --set azureKeyVault.pfxCertNames='{**,**}' --set azureKeyVault.tenantId='**' --set clusterName='**' --set azureMetricAccount.defaultAccountName='**' --set azureKeyVault.clientId='**' --set azureKeyVault.clientSecret='****' --namespace= --create-namespace ``` @@ -85,7 +87,7 @@ kubectl create configmap my-collector-dev-release-prometheus-config --from-file= | clusterName | string | `Required` | `""` | name of the k8s cluster. This will be added as a 'cluster' label for every metric scraped | | image.pullPolicy | string | Optional | `"IfNotPresent"` | | | image.repository | string | Optional | `"mcr.microsoft.com/azuremonitor/containerinsights/cidev"` | | -| image.tag | string | Optional | `"prometheus-collector-main-05-05-2021-4e51e2ce"` | | +| image.tag | string | Optional | `"prometheus-collector-main-05-05-2021-b7122082"` | | | internalSettings.intEnvironment | bool | Optional | `false` | do not use any of the internal settings. This is for testing purposes | | resources.limits.cpu | string | Optional | `2` | | | resources.limits.memory | string | Optional | `"2Gi"` | | diff --git a/otelcollector/deploy/chart/prometheus-collector/values.yaml b/otelcollector/deploy/chart/prometheus-collector/values.yaml index 341bb75cd..5c920bfb6 100644 --- a/otelcollector/deploy/chart/prometheus-collector/values.yaml +++ b/otelcollector/deploy/chart/prometheus-collector/values.yaml @@ -36,7 +36,7 @@ internalSettings: image: repository: mcr.microsoft.com/azuremonitor/containerinsights/cidev - tag: "prometheus-collector-main-05-05-2021-4e51e2ce" + tag: "prometheus-collector-main-05-05-2021-b7122082" pullPolicy: IfNotPresent resources: diff --git a/otelcollector/deploy/prometheus-collector.yaml b/otelcollector/deploy/prometheus-collector.yaml index e7ade481e..6b8f12823 100644 --- a/otelcollector/deploy/prometheus-collector.yaml +++ b/otelcollector/deploy/prometheus-collector.yaml @@ -70,7 +70,7 @@ spec: serviceAccountName: prometheus-collector containers: - name: prometheus-collector - image: "mcr.microsoft.com/azuremonitor/containerinsights/cidev:prometheus-collector-main-05-05-2021-4e51e2ce" + image: "mcr.microsoft.com/azuremonitor/containerinsights/cidev:prometheus-collector-main-05-05-2021-b7122082" imagePullPolicy: IfNotPresent resources: limits: