From 20557074a3b3367daca27702b35bbec85c333e9b Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Fri, 5 Apr 2019 17:14:49 +0200 Subject: [PATCH] Use 1.0.0-preview-3 for tomkerkhove/promitor-agent-scraper --- .../agents-scraper-release-official.yaml | 2 +- .azure-devops/scraper-ci.yml | 4 +- README.md | 4 +- .../.helmignore | 0 .../Chart.yaml | 2 +- .../templates/NOTES.txt | 4 +- .../templates/_helpers.tpl | 10 ++--- .../templates/configmap.yaml | 44 +++++++++---------- .../templates/deployment.yaml | 22 +++++----- .../templates/secret.yaml | 36 +++++++-------- .../templates/service.yaml | 8 ++-- .../values.yaml | 4 +- .../automation/docker-hub/ci/azuredeploy.json | 2 +- docs/deployment/index.md | 8 ++-- docs/index.md | 10 ++--- src/docker-compose.yml | 2 +- 16 files changed, 81 insertions(+), 81 deletions(-) rename charts/{promitor-scraper => promitor-agent-scraper}/.helmignore (100%) rename charts/{promitor-scraper => promitor-agent-scraper}/Chart.yaml (90%) rename charts/{promitor-scraper => promitor-agent-scraper}/templates/NOTES.txt (70%) mode change 100755 => 100644 rename charts/{promitor-scraper => promitor-agent-scraper}/templates/_helpers.tpl (82%) rename charts/{promitor-scraper => promitor-agent-scraper}/templates/configmap.yaml (77%) mode change 100755 => 100644 rename charts/{promitor-scraper => promitor-agent-scraper}/templates/deployment.yaml (75%) rename charts/{promitor-scraper => promitor-agent-scraper}/templates/secret.yaml (75%) mode change 100755 => 100644 rename charts/{promitor-scraper => promitor-agent-scraper}/templates/service.yaml (68%) rename charts/{promitor-scraper => promitor-agent-scraper}/values.yaml (94%) diff --git a/.azure-devops/agents-scraper-release-official.yaml b/.azure-devops/agents-scraper-release-official.yaml index f625f41f2..36ab48198 100644 --- a/.azure-devops/agents-scraper-release-official.yaml +++ b/.azure-devops/agents-scraper-release-official.yaml @@ -57,7 +57,7 @@ steps: ### Getting started Running Promitor Scraper is super easy: ``` - docker run -d -p 8999:80 --name promitor-scraper + docker run -d -p 8999:80 --name promitor-agent-scraper --env PROMITOR_AUTH_APPID='' \ --env PROMITOR_AUTH_APPKEY='' \ --volume C:/Promitor/metrics-declaration.yaml:/config/metrics-declaration.yaml \ diff --git a/.azure-devops/scraper-ci.yml b/.azure-devops/scraper-ci.yml index 4b5ca48aa..da9a39c48 100644 --- a/.azure-devops/scraper-ci.yml +++ b/.azure-devops/scraper-ci.yml @@ -84,7 +84,7 @@ jobs: containerregistrytype: 'Container Registry' dockerRegistryEndpoint: 'Docker Hub' dockerFile: ./src/Promitor.Scraper.Host/Dockerfile - arguments: '--tag promitor-scraper-ci --no-cache' + arguments: '--tag promitor-agent-scraper-ci --no-cache' useDefaultContext: false buildContext: ./src/ imageName: '$(Image.TaggedName)' @@ -99,7 +99,7 @@ jobs: imageName: '$(Image.TaggedName)' containerName: 'promitor-ci' ports: '8999:80' - volumes: '/samples/promitor-sample.yaml:/config/metrics-declaration.yaml promitor-scraper-ci' + volumes: '/samples/promitor-sample.yaml:/config/metrics-declaration.yaml promitor-agent-scraper-ci' envVars: | PROMITOR_AUTH_APPID='$(Container.Env.AzureMonitor.Id)' PROMITOR_AUTH_APPKEY='$(Container.Env.AzureMonitor.Key)' diff --git a/README.md b/README.md index 2c98d68e0..6ac09b36b 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@

License -Docker Pulls +Docker Pulls Build Status -Docker Stars +Docker Stars CodeFactor Netlify Donate diff --git a/charts/promitor-scraper/.helmignore b/charts/promitor-agent-scraper/.helmignore similarity index 100% rename from charts/promitor-scraper/.helmignore rename to charts/promitor-agent-scraper/.helmignore diff --git a/charts/promitor-scraper/Chart.yaml b/charts/promitor-agent-scraper/Chart.yaml similarity index 90% rename from charts/promitor-scraper/Chart.yaml rename to charts/promitor-agent-scraper/Chart.yaml index a7e37888f..3b16a2dd6 100644 --- a/charts/promitor-scraper/Chart.yaml +++ b/charts/promitor-agent-scraper/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus -name: promitor-scraper +name: promitor-agent-scraper icon: https://github.com/tomkerkhove/promitor/blob/master/docs/media/logos/promitor.png home: https://github.com/tomkerkhove/promitor version: 0.1.0 diff --git a/charts/promitor-scraper/templates/NOTES.txt b/charts/promitor-agent-scraper/templates/NOTES.txt old mode 100755 new mode 100644 similarity index 70% rename from charts/promitor-scraper/templates/NOTES.txt rename to charts/promitor-agent-scraper/templates/NOTES.txt index b5ac8aca1..f9db26ae4 --- a/charts/promitor-scraper/templates/NOTES.txt +++ b/charts/promitor-agent-scraper/templates/NOTES.txt @@ -1,6 +1,6 @@ 1. Forward the application port by running these commands: -export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "promitor-scraper.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") +export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "promitor-agent-scraper.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") kubectl port-forward $POD_NAME 8080:{{ .Values.service.targetPort }} 2. Check the scraping output at http://127.0.0.1:8080{{ .Values.scrapeConfig.path }} @@ -13,6 +13,6 @@ extraScrapeConfigs: | metrics_path: {{ .Values.scrapeConfig.path }} static_configs: - targets: - - {{ template "promitor-scraper.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }} + - {{ template "promitor-agent-scraper.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local:{{ .Values.service.port }} EOF helm install stable/prometheus -f promitor-scrape-config.yaml diff --git a/charts/promitor-scraper/templates/_helpers.tpl b/charts/promitor-agent-scraper/templates/_helpers.tpl similarity index 82% rename from charts/promitor-scraper/templates/_helpers.tpl rename to charts/promitor-agent-scraper/templates/_helpers.tpl index 34858d894..04063d24c 100644 --- a/charts/promitor-scraper/templates/_helpers.tpl +++ b/charts/promitor-agent-scraper/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "promitor-scraper.name" -}} +{{- define "promitor-agent-scraper.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -11,7 +11,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "promitor-scraper.fullname" -}} +{{- define "promitor-agent-scraper.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "promitor-scraper.chart" -}} +{{- define "promitor-agent-scraper.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create secret name based on whether or not user defined it. */}} -{{- define "promitor-scraper.secretname" -}} +{{- define "promitor-agent-scraper.secretname" -}} {{- if .Values.secrets.createSecret -}} -{{ template "promitor-scraper.fullname" . }} +{{ template "promitor-agent-scraper.fullname" . }} {{- else -}} {{- printf "%s" .Values.secrets.secretName -}} {{- end -}} diff --git a/charts/promitor-scraper/templates/configmap.yaml b/charts/promitor-agent-scraper/templates/configmap.yaml old mode 100755 new mode 100644 similarity index 77% rename from charts/promitor-scraper/templates/configmap.yaml rename to charts/promitor-agent-scraper/templates/configmap.yaml index aec077e54..2a36fcf52 --- a/charts/promitor-scraper/templates/configmap.yaml +++ b/charts/promitor-agent-scraper/templates/configmap.yaml @@ -1,23 +1,23 @@ -{{- $metrics := toYaml .Values.metrics -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: config-map-{{ template "promitor-scraper.fullname" . }} - labels: - app: {{ template "promitor-scraper.name" . }} - chart: {{ template "promitor-scraper.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: - metrics-declaration.yaml: |- - azureMetadata: - tenantId: {{ .Values.azureMetadata.tenantId }} - subscriptionId: {{ .Values.azureMetadata.subscriptionId }} - resourceGroupName: {{ .Values.azureMetadata.resourceGroupName }} - metricDefaults: - aggregation: - interval: {{ .Values.metricDefaults.aggregation.interval }} - scraping: - schedule: {{ .Values.metricDefaults.scraping.schedule | quote }} - metrics: +{{- $metrics := toYaml .Values.metrics -}} +apiVersion: v1 +kind: ConfigMap +metadata: + name: config-map-{{ template "promitor-agent-scraper.fullname" . }} + labels: + app: {{ template "promitor-agent-scraper.name" . }} + chart: {{ template "promitor-agent-scraper.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: + metrics-declaration.yaml: |- + azureMetadata: + tenantId: {{ .Values.azureMetadata.tenantId }} + subscriptionId: {{ .Values.azureMetadata.subscriptionId }} + resourceGroupName: {{ .Values.azureMetadata.resourceGroupName }} + metricDefaults: + aggregation: + interval: {{ .Values.metricDefaults.aggregation.interval }} + scraping: + schedule: {{ .Values.metricDefaults.scraping.schedule | quote }} + metrics: {{ tpl $metrics . | indent 4 }} \ No newline at end of file diff --git a/charts/promitor-scraper/templates/deployment.yaml b/charts/promitor-agent-scraper/templates/deployment.yaml similarity index 75% rename from charts/promitor-scraper/templates/deployment.yaml rename to charts/promitor-agent-scraper/templates/deployment.yaml index 4adad3440..5b57d1a4b 100644 --- a/charts/promitor-scraper/templates/deployment.yaml +++ b/charts/promitor-agent-scraper/templates/deployment.yaml @@ -1,10 +1,10 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "promitor-scraper.fullname" . }} + name: {{ template "promitor-agent-scraper.fullname" . }} labels: - app: {{ template "promitor-scraper.name" . }} - chart: {{ template "promitor-scraper.chart" . }} + app: {{ template "promitor-agent-scraper.name" . }} + chart: {{ template "promitor-agent-scraper.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: @@ -16,13 +16,13 @@ spec: maxUnavailable: 1 selector: matchLabels: - app: {{ template "promitor-scraper.name" . }} + app: {{ template "promitor-agent-scraper.name" . }} release: {{ .Release.Name }} type: {{ .Values.service.selectorType }} template: metadata: labels: - app: {{ template "promitor-scraper.name" . }} + app: {{ template "promitor-agent-scraper.name" . }} release: {{ .Release.Name }} type: {{ .Values.service.selectorType }} annotations: @@ -43,12 +43,12 @@ spec: - name: PROMITOR_AUTH_APPID valueFrom: secretKeyRef: - name: {{ template "promitor-scraper.secretname" . }} + name: {{ template "promitor-agent-scraper.secretname" . }} key: {{ .Values.secrets.appIdSecret }} - name: PROMITOR_AUTH_APPKEY valueFrom: secretKeyRef: - name: {{ template "promitor-scraper.secretname" . }} + name: {{ template "promitor-agent-scraper.secretname" . }} key: {{ .Values.secrets.appKeySecret }} - name: PROMITOR_HTTP_PORT value: {{ .Values.service.targetPort | quote }} @@ -62,11 +62,11 @@ spec: - name: PROMITOR_TELEMETRY_INSTRUMENTATIONKEY valueFrom: secretKeyRef: - name: {{ template "promitor-scraper.secretname" . }} + name: {{ template "promitor-agent-scraper.secretname" . }} key: {{ .Values.secrets.appInsightsSecret }} {{- end }} volumeMounts: - - name: config-volume-{{ template "promitor-scraper.fullname" . }} + - name: config-volume-{{ template "promitor-agent-scraper.fullname" . }} mountPath: /config/ livenessProbe: httpGet: @@ -77,6 +77,6 @@ spec: path: /api/v1/health port: http volumes: - - name: config-volume-{{ template "promitor-scraper.fullname" . }} + - name: config-volume-{{ template "promitor-agent-scraper.fullname" . }} configMap: - name: config-map-{{ template "promitor-scraper.fullname" . }} \ No newline at end of file + name: config-map-{{ template "promitor-agent-scraper.fullname" . }} \ No newline at end of file diff --git a/charts/promitor-scraper/templates/secret.yaml b/charts/promitor-agent-scraper/templates/secret.yaml old mode 100755 new mode 100644 similarity index 75% rename from charts/promitor-scraper/templates/secret.yaml rename to charts/promitor-agent-scraper/templates/secret.yaml index 15faf7b39..01106a9ac --- a/charts/promitor-scraper/templates/secret.yaml +++ b/charts/promitor-agent-scraper/templates/secret.yaml @@ -1,18 +1,18 @@ -{{- if .Values.secrets.createSecret }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "promitor-scraper.secretname" . }} - labels: - app: {{ template "promitor-scraper.name" . }} - chart: {{ template "promitor-scraper.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -type: Opaque -data: - {{ .Values.secrets.appIdSecret }}: {{ .Values.azureAuthentication.appId | b64enc | quote }} - {{ .Values.secrets.appKeySecret }}: {{ .Values.azureAuthentication.appKey | b64enc | quote }} -{{- if .Values.telemetry.appInsightsKey }} - {{ .Values.secrets.appInsightsSecret }}: {{ .Values.telemetry.appInsightsKey | b64enc | quote }} -{{- end }} -{{- end }} +{{- if .Values.secrets.createSecret }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ template "promitor-agent-scraper.secretname" . }} + labels: + app: {{ template "promitor-agent-scraper.name" . }} + chart: {{ template "promitor-agent-scraper.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +type: Opaque +data: + {{ .Values.secrets.appIdSecret }}: {{ .Values.azureAuthentication.appId | b64enc | quote }} + {{ .Values.secrets.appKeySecret }}: {{ .Values.azureAuthentication.appKey | b64enc | quote }} +{{- if .Values.telemetry.appInsightsKey }} + {{ .Values.secrets.appInsightsSecret }}: {{ .Values.telemetry.appInsightsKey | b64enc | quote }} +{{- end }} +{{- end }} diff --git a/charts/promitor-scraper/templates/service.yaml b/charts/promitor-agent-scraper/templates/service.yaml similarity index 68% rename from charts/promitor-scraper/templates/service.yaml rename to charts/promitor-agent-scraper/templates/service.yaml index 0cbb4be51..88b954a82 100644 --- a/charts/promitor-scraper/templates/service.yaml +++ b/charts/promitor-agent-scraper/templates/service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "promitor-scraper.fullname" . }} + name: {{ template "promitor-agent-scraper.fullname" . }} labels: - app: {{ template "promitor-scraper.name" . }} - chart: {{ template "promitor-scraper.chart" . }} + app: {{ template "promitor-agent-scraper.name" . }} + chart: {{ template "promitor-agent-scraper.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} type: {{ .Values.service.labelType }} @@ -20,6 +20,6 @@ spec: targetPort: {{ .Values.service.targetPort }} protocol: TCP selector: - app: {{ template "promitor-scraper.name" . }} + app: {{ template "promitor-agent-scraper.name" . }} release: {{ .Release.Name }} type: {{ .Values.service.selectorType }} diff --git a/charts/promitor-scraper/values.yaml b/charts/promitor-agent-scraper/values.yaml similarity index 94% rename from charts/promitor-scraper/values.yaml rename to charts/promitor-agent-scraper/values.yaml index 95450185d..8beefdf41 100644 --- a/charts/promitor-scraper/values.yaml +++ b/charts/promitor-agent-scraper/values.yaml @@ -1,11 +1,11 @@ -# Default values for promitor-scraper. +# Default values for promitor-agent-scraper. # This is a YAML-formatted file. replicaCount: 1 image: repository: tomkerkhove/promitor-agent-scraper - tag: 1.0.0-preview-2 + tag: 1.0.0-preview-3 pullPolicy: Always azureAuthentication: diff --git a/deploy/automation/docker-hub/ci/azuredeploy.json b/deploy/automation/docker-hub/ci/azuredeploy.json index d4d24e572..3d9a1f761 100644 --- a/deploy/automation/docker-hub/ci/azuredeploy.json +++ b/deploy/automation/docker-hub/ci/azuredeploy.json @@ -51,7 +51,7 @@ "$schema": "https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#", "actions": { "Define_GitHub_comment_text": { - "inputs": "Docker image for this PR was built and is available on [Docker Hub](@{triggerBody()?['repository']?['repo_url']}).\n\nYou can pull it locally via the CLI:\n```shell\ndocker pull @{triggerBody()?['repository']?['repo_name']}:@{triggerBody()?['push_data']?['tag']}\n```\n\nWant to verify the new version? Run it locally:\n```shell\ndocker run -d -p 8999:80 --name promitor-scraper-@{triggerBody()?['push_data']?['tag']} \\\n --env PROMITOR_AUTH_APPID='' \\\n --env PROMITOR_AUTH_APPKEY='' \\\n --volume C:/Promitor/metrics-declaration.yaml:/config/metrics-declaration.yaml \\\n @{triggerBody()?['repository']?['repo_name']}:@{triggerBody()?['push_data']?['tag']}\n```", + "inputs": "Docker image for this PR was built and is available on [Docker Hub](@{triggerBody()?['repository']?['repo_url']}).\n\nYou can pull it locally via the CLI:\n```shell\ndocker pull @{triggerBody()?['repository']?['repo_name']}:@{triggerBody()?['push_data']?['tag']}\n```\n\nWant to verify the new version? Run it locally:\n```shell\ndocker run -d -p 8999:80 --name promitor-agent-scraper-@{triggerBody()?['push_data']?['tag']} \\\n --env PROMITOR_AUTH_APPID='' \\\n --env PROMITOR_AUTH_APPKEY='' \\\n --volume C:/Promitor/metrics-declaration.yaml:/config/metrics-declaration.yaml \\\n @{triggerBody()?['repository']?['repo_name']}:@{triggerBody()?['push_data']?['tag']}\n```", "runAfter": { "Determine_GitHub_Issue_Id": [ "Succeeded" diff --git a/docs/deployment/index.md b/docs/deployment/index.md index 5414e9fa0..d63baf8d9 100644 --- a/docs/deployment/index.md +++ b/docs/deployment/index.md @@ -13,11 +13,11 @@ _For more information about advanced configuration, read our documentation [here ❯ docker run -d -p 8999:80 -e PROMITOR_AUTH_APPID='' \ -e PROMITOR_AUTH_APPKEY='' \ -v C:/Promitor/metrics-declaration.yaml:/config/metrics-declaration.yaml \ - tomkerkhove/promitor-scraper + tomkerkhove/promitor-agent-scraper:1.0.0-preview-3 ``` # Kubernetes -We currently provide [a helm chart](https://github.com/tomkerkhove/promitor/tree/master/charts/promitor-scraper) which deploys all the required infrastructure on your Kubernetes cluster. +We currently provide [a helm chart](https://github.com/tomkerkhove/promitor/tree/master/charts/promitor-agent-scraper) which deploys all the required infrastructure on your Kubernetes cluster. To use this, you will need to provide parameters [via `--set` or `--values`](https://helm.sh/docs/using_helm/#customizing-the-chart-before-installing). Included here are the values that correspond with the local environment variables. In addition to these, you will need a metric declaration file as described in [Metric Declaration](/configuration/metrics). @@ -40,11 +40,11 @@ telemetry: appInsightsKey: "" ``` -Check the [full values file](https://github.com/tomkerkhove/promitor/blob/master/charts/promitor-scraper/values.yaml) to see all configurable values. +Check the [full values file](https://github.com/tomkerkhove/promitor/blob/master/charts/promitor-agent-scraper/values.yaml) to see all configurable values. If you have a `metric-declaration.yaml` file, you can create a basic deployment with this command: ``` -❯ helm install --name promitor-scraper ./charts/promitor-scraper \ +❯ helm install --name promitor-agent-scraper ./charts/promitor-agent-scraper \ --set azureAuthentication.appId='' \ --set azureAuthentication.appKey='' \ --values /path/to/metric-declaration.yaml diff --git a/docs/index.md b/docs/index.md index d4b471a33..46e1d8ac0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -3,8 +3,8 @@ layout: default title: Promitor - An Azure Monitor scraper for Prometheus --- -[![License](https://img.shields.io/github/license/mashape/apistatus.svg?style=flat-square)](https://github.com/tomkerkhove/promitor/blob/master/LICENSE)[![Build Status](https://dev.azure.com/tomkerkhove/Promitor/_apis/build/status/Promitor%20CI%20-%20Scraper%20Agent?branchName=master)](https://dev.azure.com/tomkerkhove/Promitor/_build/latest?definitionId=50&branchName=master) [![Docker Pulls](https://img.shields.io/docker/pulls/tomkerkhove/promitor-scraper.svg?style=flat-square)](https://hub.docker.com/r/tomkerkhove/promitor-scraper/) -[![Docker Stars](https://img.shields.io/docker/stars/tomkerkhove/promitor-scraper.svg?style=flat-square)](https://hub.docker.com/r/tomkerkhove/promitor-scraper/)[![Donate](https://promitor.io/media/buttons/paypal.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LYCEDSP3S5P9G&source=url) +[![License](https://img.shields.io/github/license/mashape/apistatus.svg?style=flat-square)](https://github.com/tomkerkhove/promitor/blob/master/LICENSE)[![Build Status](https://dev.azure.com/tomkerkhove/Promitor/_apis/build/status/Promitor%20CI%20-%20Scraper%20Agent?branchName=master)](https://dev.azure.com/tomkerkhove/Promitor/_build/latest?definitionId=50&branchName=master) [![Docker Pulls](https://img.shields.io/docker/pulls/tomkerkhove/promitor-agent-scraper.svg?style=flat-square)](https://hub.docker.com/r/tomkerkhove/promitor-agent-scraper/) +[![Docker Stars](https://img.shields.io/docker/stars/tomkerkhove/promitor-agent-scraper.svg?style=flat-square)](https://hub.docker.com/r/tomkerkhove/promitor-agent-scraper/)[![Donate](https://promitor.io/media/buttons/paypal.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LYCEDSP3S5P9G&source=url) **Promitor** is an **Azure Monitor scraper for Prometheus** providing a scraping endpoint for Prometheus that provides a configured subset of Azure Monitor metrics. @@ -15,14 +15,14 @@ title: Promitor - An Azure Monitor scraper for Prometheus # Running Promitor Scraper Running Promitor Scraper is super easy: ``` -docker run -d -p 8999:80 --name promitor-scraper \ +docker run -d -p 8999:80 --name promitor-agent-scraper \ --env PROMITOR_AUTH_APPID='' \ --env PROMITOR_AUTH_APPKEY='' \ --volume C:/Promitor/metrics-declaration.yaml:/config/metrics-declaration.yaml \ - tomkerkhove/promitor-scraper + tomkerkhove/promitor-agent-scraper:1.0.0-preview-3 ``` -Docker image is available on [Docker Hub](https://hub.docker.com/r/tomkerkhove/promitor-scraper/). +Docker image is available on [Docker Hub](https://hub.docker.com/r/tomkerkhove/promitor-agent-scraper/). # Features diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 5873e34ab..699c91472 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.4' services: promitor.scraper: - image: tomkerkhove/promitor-scraper + image: tomkerkhove/promitor-agent-scraper build: context: . dockerfile: Promitor.Scraper.Host/Dockerfile