Skip to content

Commit

Permalink
Vishwa/prometheus collector 0505 2 (#8)
Browse files Browse the repository at this point in the history
* update to latest build.

* fix readme

* fix readme

* fix readme

* fix readme

* fix all readme
  • Loading branch information
vishiy authored May 5, 2021
1 parent b712208 commit 697225f
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 4 additions & 1 deletion otelcollector/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 4 additions & 1 deletion otelcollector/deploy/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
12 changes: 7 additions & 5 deletions otelcollector/deploy/chart/prometheus-collector/README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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 <chart_release_name> ./prometheus-collector --set azureKeyVault.name='**' --set azureKeyVault.pfxCertNames='{**,**}' --set azureKeyVault.tenantId='**' --set clusterName='**' --set azureMetricAccount.defaultAccountName='**' --set azureKeyVault.clientId='**' --set azureKeyVault.clientSecret='****' --namespace=<my_prom_collector_namespace> --create-namespace
```
Expand Down Expand Up @@ -85,7 +87,7 @@ kubectl create configmap my-collector-dev-release-prometheus-config --from-file=
| clusterName | string | <mark>`Required`</mark> | `""` | 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"` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion otelcollector/deploy/prometheus-collector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 697225f

Please sign in to comment.