From 94681d5286173a40160be6ab45a1cddd6c9c56eb Mon Sep 17 00:00:00 2001 From: arielhaim Date: Sun, 6 Nov 2022 18:06:28 +0200 Subject: [PATCH 1/3] initial commit --- README.md | 53 +---- config/scraper.yaml | 9 +- docs/index.yaml | 145 +++++-------- examples/promitor-agent-scraper.config.yaml | 27 +-- promitor-agent-resource-discovery/Chart.yaml | 2 +- promitor-agent-resource-discovery/README.md | 1 - .../templates/deployment.yaml | 4 - promitor-agent-resource-discovery/values.yaml | 2 +- promitor-agent-scraper/Chart.yaml | 4 +- promitor-agent-scraper/README.md | 5 - .../templates/configmap.yaml | 30 +-- .../templates/deployment.yaml | 196 ++++++++++++++++- .../templates/podidentity.yaml | 34 +++ promitor-agent-scraper/values.yaml | 202 +++++++++++++----- 14 files changed, 476 insertions(+), 238 deletions(-) create mode 100644 promitor-agent-scraper/templates/podidentity.yaml diff --git a/README.md b/README.md index d097639..8253809 100644 --- a/README.md +++ b/README.md @@ -1,52 +1,11 @@ -# Promitor - Helm Charts +az acr login -n wdatpacreus.azurecr.io -[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/promitor)](https://artifacthub.io/packages/search?repo=promitor) -Official Helm chart repository for Promitor. +# run this from ./src folder +docker build . -t mdm-scraper-3 -f .\Promitor.Agents.Scraper\Dockerfile.linux +docker tag mdm-scraper-3 wdatpacreus.azurecr.io/mgmt.promitor.scraper:20220915.1 +docker push wdatpacreus.azurecr.io/mgmt.promitor.scraper:20220915.1 -## Documentation -All documentation is available on [docs.promitor.io](https://docs.promitor.io) +helm upgrade --install mgmt-promitor-mdm promitor-agent-scraper -n management -## Support - -Learn more about our support options [here](https://github.com/tomkerkhove/promitor/blob/master/SUPPORT.md). - -Thanks for those who are supporting us via [GitHub Sponsors](https://github.com/sponsors/tomkerkhove/). - -[![Carlo Garcia-Mier](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/CarloGarcia.jpg)](https://github.com/CarloGarcia) -[![Jorge Turrado Ferrero](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/JorTurFer.jpg)](https://github.com/JorTurFer) -[![Karl Ots](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/karlgots.jpg)](https://github.com/karlgots) -[![Loc Mai](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/locmai.jpg)](https://github.com/locmai) -[![Lovelace Engineering](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/LovelaceEngineering.png)](https://github.com/LovelaceEngineering) -[![Nills Franssens](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/nillsf.jpg)](https://github.com/NillsF) -[![Richard Simpson](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/RichiCoder1.jpg)](https://github.com/RichiCoder1) -[![Sam Vanhoutte](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/samvanhoutte.png)](https://github.com/samvanhoutte) - -## Security - -Learn more about our security policy [here](https://github.com/tomkerkhove/promitor/security/policy). - -## Donate - -Promitor is fully OSS and built free-of-charge, however, if you appreciate my work -you can do a small donation. - -[![Donate](https://img.shields.io/badge/Donate%20via-GitHub-blue.svg?style=flat-square)](https://github.com/sponsors/promitor) - -## Get in touch - -Do you have a security issue to report or just want to privately contact me? Feel -free to [write me an email](mailto:kerkhove.tom@gmail.com) or [get listed as a user](https://forms.gle/hjcpaaVFa1A1hZaK6). - -## Thank you - -We'd like to thank all the services, tooling & NuGet packages that support us - - [Thank you](https://promitor.io/thank-you)! - -## License Information - -This is licensed under The MIT License (MIT). Which means that you can use, copy, -modify, merge, publish, distribute, sublicense, and/or sell copies of the web -application. But you always need to state that Tom Kerkhove is the original author -of this web application. diff --git a/config/scraper.yaml b/config/scraper.yaml index 2ddc6bc..f80acb9 100644 --- a/config/scraper.yaml +++ b/config/scraper.yaml @@ -1,9 +1,10 @@ runtime: metricSinks: - prometheusScrapingEndpoint: - metricUnavailableValue: -1 - enableMetricTimestamps: true # true by default - baseUriPath: /scrape + # prometheusScrapingEndpoint: + # metricUnavailableValue: -1 + # enableMetricTimestamps: true # true by default + # baseUriPath: /scrape + mdm: [] # metricsConfiguration: # absolutePath: /config/metrics-declaration.yaml azureMetadata: diff --git a/docs/index.yaml b/docs/index.yaml index 77f62d5..2dbf5bb 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,26 +3,7 @@ entries: promitor-agent-resource-discovery: - apiVersion: v2 appVersion: 0.8.0 - created: "2022-10-06T11:00:50.54914101Z" - description: Automatically discover Azure resources to be scraped by Promitor - Scraper agent. - digest: 5370fdf64f9f5641b4820556b450f433dc6808836236aa75dad4ca253af59aee - home: https://promitor.io - icon: https://raw.githubusercontent.com/tomkerkhove/promitor/master/docs/media/logos/promitor.png - maintainers: - - name: Tom Kerkhove - url: https://github.com/tomkerkhove - name: promitor-agent-resource-discovery - sources: - - https://github.com/tomkerkhove/promitor - - https://github.com/promitor/charts - type: application - urls: - - https://charts.promitor.io/promitor-agent-resource-discovery-0.8.1.tgz - version: 0.8.1 - - apiVersion: v2 - appVersion: 0.8.0 - created: "2022-10-06T11:00:50.548350499Z" + created: "2022-06-23T13:34:34.5434943+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 3e644bbd0340bd6429c37b2e4c7a044c82e99d370cba80b266d35f065f031487 @@ -41,7 +22,7 @@ entries: version: 0.8.0 - apiVersion: v2 appVersion: 0.7.1 - created: "2022-10-06T11:00:50.547199081Z" + created: "2022-06-23T13:34:34.5424927+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 21afb7e7df877cbf7dc0e373c6324b51b6fd08f4c630b991c14afbc61a5af024 @@ -60,7 +41,7 @@ entries: version: 0.7.5 - apiVersion: v2 appVersion: 0.7.1 - created: "2022-10-06T11:00:50.546217367Z" + created: "2022-06-23T13:34:34.5332451+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 6f0bf49cc3babe34ef96377830381fe83dca59e4f57bd26111296ab9e5e2a9f1 @@ -79,7 +60,7 @@ entries: version: 0.7.4 - apiVersion: v2 appVersion: 0.7.1 - created: "2022-10-06T11:00:50.545431955Z" + created: "2022-06-23T13:34:34.5278468+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 24cb982511b8ecf2dd9f71872a486540cd8ae61cc7ecfd6871a00561b86f6187 @@ -98,7 +79,7 @@ entries: version: 0.7.3 - apiVersion: v2 appVersion: 0.7.0 - created: "2022-10-06T11:00:50.544652944Z" + created: "2022-06-23T13:34:34.5220859+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: f5937fe48519dd49bec702a0073036c181f13f196a8ea1aa428989369b3e7559 @@ -117,7 +98,7 @@ entries: version: 0.7.2 - apiVersion: v2 appVersion: 0.7.0 - created: "2022-10-06T11:00:50.543919133Z" + created: "2022-06-23T13:34:34.510758+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 044ff8f49bb248dd0bd6d08e496c71104143469450dd093e60cd6c5975cbc830 @@ -136,7 +117,7 @@ entries: version: 0.7.1 - apiVersion: v2 appVersion: 0.7.0 - created: "2022-10-06T11:00:50.543112321Z" + created: "2022-06-23T13:34:34.4951774+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: b687baf96e770030e9be4d35fe38a9d40ab9469f9dae8e91549461a34034b02d @@ -155,7 +136,7 @@ entries: version: 0.7.0 - apiVersion: v2 appVersion: 0.6.0 - created: "2022-10-06T11:00:50.542224308Z" + created: "2022-06-23T13:34:34.4831745+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 574ef36ae899031a99034b1b7df0dd0d4e222c2f193295b34408782d03a5e1af @@ -174,7 +155,7 @@ entries: version: 0.6.0 - apiVersion: v2 appVersion: 0.5.0 - created: "2022-10-06T11:00:50.541360995Z" + created: "2022-06-23T13:34:34.4713912+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 279700c3a164166d99da1c77c3970a769a68187629f86099ef3f918c55c5e12e @@ -193,7 +174,7 @@ entries: version: 0.5.0 - apiVersion: v2 appVersion: 0.4.1 - created: "2022-10-06T11:00:50.539291764Z" + created: "2022-06-23T13:34:34.4573012+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 402804b870f74710577394342639aa814ab0e3e9fce9273c4f455118bce49780 @@ -212,7 +193,7 @@ entries: version: 0.4.1 - apiVersion: v2 appVersion: 0.4.0 - created: "2022-10-06T11:00:50.538486852Z" + created: "2022-06-23T13:34:34.4493068+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 7201436c7df8b1cd4fa151a02d6c642bc1d76f01ec6a3f4e412dabbd451c02ba @@ -231,7 +212,7 @@ entries: version: 0.4.0 - apiVersion: v2 appVersion: 0.3.0 - created: "2022-10-06T11:00:50.53766904Z" + created: "2022-06-23T13:34:34.4383039+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 202e7e1916c938101a1a3629f3b97d459c12aae1eb4c569d7e0efbe46946ff51 @@ -250,7 +231,7 @@ entries: version: 0.3.0 - apiVersion: v2 appVersion: 0.2.0 - created: "2022-10-06T11:00:50.536841928Z" + created: "2022-06-23T13:34:34.4318822+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: c206a387cdb2cf35737a772647e614530d5f1590963a15191840f5079798a3ce @@ -269,7 +250,7 @@ entries: version: 0.2.0 - apiVersion: v2 appVersion: 0.1.0 - created: "2022-10-06T11:00:50.536116217Z" + created: "2022-06-23T13:34:34.4251541+02:00" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 41ab73a2c05df5412e6b2debe8e2694aee05c430f39e3224988defc7ff79bf5b @@ -288,7 +269,7 @@ entries: version: 0.1.0 - apiVersion: v2 appVersion: 0.1.0-rc-2 - created: "2022-10-06T11:00:50.534524694Z" + created: "2022-06-23T13:34:34.4126905+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 9c867d55e15d9c1ab9bfe7c461b5e8bf7a2338b696923a2928a8a90d641d73b7 home: https://promitor.io @@ -305,7 +286,7 @@ entries: version: 0.1.0-rc-2 - apiVersion: v2 appVersion: 0.1.0-rc - created: "2022-10-06T11:00:50.535170303Z" + created: "2022-06-23T13:34:34.4196071+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: e0b656e263fec6b1af59a67ba842e486a5f7f6917424ebf78a97d16610cad0b8 home: https://promitor.io @@ -321,27 +302,9 @@ entries: - https://charts.promitor.io/promitor-agent-resource-discovery-0.1.0-rc.tgz version: 0.1.0-rc promitor-agent-scraper: - - apiVersion: v2 - appVersion: 2.8.0 - created: "2022-10-06T11:00:50.600639773Z" - description: Promitor, bringing Azure Monitor metrics where you need them. - digest: 6fae193b93bfdb014d728f92c25dd8ec0341719b8654d1377909ce08dd03d815 - home: https://promitor.io - icon: https://raw.githubusercontent.com/tomkerkhove/promitor/master/docs/media/logos/promitor.png - maintainers: - - name: Tom Kerkhove - url: https://github.com/tomkerkhove - name: promitor-agent-scraper - sources: - - https://github.com/tomkerkhove/promitor - - https://github.com/promitor/charts - type: application - urls: - - https://charts.promitor.io/promitor-agent-scraper-2.9.0.tgz - version: 2.9.0 - apiVersion: v2 appVersion: 2.7.0 - created: "2022-10-06T11:00:50.599586658Z" + created: "2022-06-23T13:34:34.8930641+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 2de55fbf04d3208680ea071d09e21046d033587658e81be49a20cc9fdfb81e7f home: https://promitor.io @@ -359,7 +322,7 @@ entries: version: 2.8.0 - apiVersion: v2 appVersion: 2.6.1 - created: "2022-10-06T11:00:50.598474941Z" + created: "2022-06-23T13:34:34.8915586+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: bbb86984b503549933aaa5456324a4e6cb3a99ee2c6cacc84da292b098fffd67 home: https://promitor.io @@ -377,7 +340,7 @@ entries: version: 2.7.4 - apiVersion: v2 appVersion: 2.6.1 - created: "2022-10-06T11:00:50.597351325Z" + created: "2022-06-23T13:34:34.8869019+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: e33e9719a4928f8cb9c8fddad51d832dfe8fd64afa06cd6e05bac130fbbbca94 home: https://promitor.io @@ -395,7 +358,7 @@ entries: version: 2.7.3 - apiVersion: v2 appVersion: 2.6.0 - created: "2022-10-06T11:00:50.596249108Z" + created: "2022-06-23T13:34:34.8804551+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 1df9b09fabe0d5ea78c77c85672b9b0c37cd26411f22571c45b5721bad02ae18 home: https://promitor.io @@ -413,7 +376,7 @@ entries: version: 2.7.2 - apiVersion: v2 appVersion: 2.6.0 - created: "2022-10-06T11:00:50.594969489Z" + created: "2022-06-23T13:34:34.8747153+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: af7022165bdadca08858330285f2961f67092b198c7100de0bbcfbf12c051105 home: https://promitor.io @@ -431,7 +394,7 @@ entries: version: 2.7.1 - apiVersion: v2 appVersion: 2.6.0 - created: "2022-10-06T11:00:50.593916474Z" + created: "2022-06-23T13:34:34.8688205+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: bcddf71b8d15f9b85111844d9f12926daca22e34d134ab253b2ba6ae0af7a026 home: https://promitor.io @@ -449,7 +412,7 @@ entries: version: 2.7.0 - apiVersion: v2 appVersion: 2.5.1 - created: "2022-10-06T11:00:50.592913259Z" + created: "2022-06-23T13:34:34.8630276+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 843cc6911a616ba91bfdaac57197db410cb53f9257f666b3be5b43ec69b42608 home: https://promitor.io @@ -467,7 +430,7 @@ entries: version: 2.6.3 - apiVersion: v2 appVersion: 2.5.1 - created: "2022-10-06T11:00:50.591926444Z" + created: "2022-06-23T13:34:34.8554959+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 1f7640545533f9486b4fb41836ac0ef2a29b953a0234ef0a163ad9ed035d60f6 home: https://promitor.io @@ -485,7 +448,7 @@ entries: version: 2.6.2 - apiVersion: v2 appVersion: 2.5.1 - created: "2022-10-06T11:00:50.590912429Z" + created: "2022-06-23T13:34:34.8490348+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: eab8ef204f1d05969fb78b36ccd7aaefa50d883bf70484c58603ef10c2124af9 home: https://promitor.io @@ -503,7 +466,7 @@ entries: version: 2.6.1 - apiVersion: v2 appVersion: 2.5.0 - created: "2022-10-06T11:00:50.588733497Z" + created: "2022-06-23T13:34:34.8403879+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: b9f4570035093e4ae1d5230d5086befdea2911ec41b9221df7135dbe91dfb13d home: https://promitor.io @@ -521,7 +484,7 @@ entries: version: 2.6.0 - apiVersion: v2 appVersion: 2.4.0 - created: "2022-10-06T11:00:50.587811583Z" + created: "2022-06-23T13:34:34.8235641+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: e94aeb714c867a6715c6e6acceec6d1e24d9bf7aecc6aabb6307dcc038fcb718 home: https://promitor.io @@ -539,7 +502,7 @@ entries: version: 2.5.1 - apiVersion: v2 appVersion: 2.4.0 - created: "2022-10-06T11:00:50.58692167Z" + created: "2022-06-23T13:34:34.8079298+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: b71ef0bfec7364b10648c84c53b718e0338f4d58f7fe6698147a1b9290ea9abf home: https://promitor.io @@ -557,7 +520,7 @@ entries: version: 2.5.0 - apiVersion: v2 appVersion: 2.3.0 - created: "2022-10-06T11:00:50.586074857Z" + created: "2022-06-23T13:34:34.7894661+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: d57eadb9d6bc80aa3d841f6e39025b20cd0260582ca1d3a2c24ff9f365f7ba34 home: https://promitor.io @@ -575,7 +538,7 @@ entries: version: 2.4.3 - apiVersion: v2 appVersion: 2.3.0 - created: "2022-10-06T11:00:50.585170144Z" + created: "2022-06-23T13:34:34.7725325+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 3e4bca591350c79133347f04a9091b3fd06744fdaefe536a543c4262d93bc6c6 home: https://promitor.io @@ -593,7 +556,7 @@ entries: version: 2.4.2 - apiVersion: v2 appVersion: 2.3.0 - created: "2022-10-06T11:00:50.584309431Z" + created: "2022-06-23T13:34:34.7576909+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: a781247f01cf3c1a1c27361fffd46c38a27483b1508f3bc888805fc1977ddbdb home: https://promitor.io @@ -611,7 +574,7 @@ entries: version: 2.4.1 - apiVersion: v2 appVersion: 2.3.0 - created: "2022-10-06T11:00:50.583480819Z" + created: "2022-06-23T13:34:34.7415438+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 012301d7961d219c94aa494f13b526a358313089eec81ab2d2fbed2578fd1263 home: https://promitor.io @@ -629,7 +592,7 @@ entries: version: 2.4.0 - apiVersion: v2 appVersion: 2.2.0 - created: "2022-10-06T11:00:50.582633606Z" + created: "2022-06-23T13:34:34.729962+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: d2a11eccf620a7d310cd760a3ec590be3dfbc43fbba329f724ea144ff6f125c6 home: https://promitor.io @@ -647,7 +610,7 @@ entries: version: 2.3.0 - apiVersion: v2 appVersion: 2.1.1 - created: "2022-10-06T11:00:50.581752793Z" + created: "2022-06-23T13:34:34.7210093+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 946142bf80bd62d85c4c818f232c4e8a640f48d76e7a0854d16d143179044a08 home: https://promitor.io @@ -665,7 +628,7 @@ entries: version: 2.2.2 - apiVersion: v2 appVersion: 2.1.0 - created: "2022-10-06T11:00:50.580806179Z" + created: "2022-06-23T13:34:34.7091571+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 0fd0eac74a82c9741c84a2728ca2d5e173fa29ae4ce2056b7f41ac88120e75ea home: https://promitor.io @@ -683,7 +646,7 @@ entries: version: 2.2.1 - apiVersion: v2 appVersion: 2.1.0 - created: "2022-10-06T11:00:50.579822165Z" + created: "2022-06-23T13:34:34.6961603+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 85a89c6109f53fc2fbfaca66fb562bb84e4bb827c0166e4a71d8ef919cfecbb6 home: https://promitor.io @@ -701,7 +664,7 @@ entries: version: 2.2.0 - apiVersion: v2 appVersion: 2.0.0 - created: "2022-10-06T11:00:50.577964437Z" + created: "2022-06-23T13:34:34.6829279+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 2cda4a464fc7557598d0e672862bcafc436f927257d2eff358b0b756cc2baf30 home: https://promitor.io @@ -719,7 +682,7 @@ entries: version: 2.1.0 - apiVersion: v2 appVersion: 2.0.0 - created: "2022-10-06T11:00:50.577204226Z" + created: "2022-06-23T13:34:34.6712345+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 610f22aeaede52044e7a2979f9c8935884d9e4885e1b7a22cc52a8fe10893a18 home: https://promitor.io @@ -737,7 +700,7 @@ entries: version: 2.0.0 - apiVersion: v2 appVersion: 2.0.0-rc-2 - created: "2022-10-06T11:00:50.575850406Z" + created: "2022-06-23T13:34:34.6465401+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: f8e455f8e216d22fb935fe6ac0d67a99dd67cf3608df6d3c1ebbccd297f4e8c8 home: https://promitor.io @@ -754,7 +717,7 @@ entries: version: 2.0.0-rc-2 - apiVersion: v2 appVersion: 2.0.0-rc - created: "2022-10-06T11:00:50.576514316Z" + created: "2022-06-23T13:34:34.6606081+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: fb98e45ff316fc3af85a050edae9ecd02c1a1f379eed28d6a6dfe28b4f61d1fe home: https://promitor.io @@ -771,7 +734,7 @@ entries: version: 2.0.0-rc - apiVersion: v2 appVersion: 2.0.0-preview-3 - created: "2022-10-06T11:00:50.575161096Z" + created: "2022-06-23T13:34:34.6396811+02:00" description: Promitor, bringing Azure Monitor metrics where you need them. digest: c339ca4b67df12eadcce807bd7bea0fed12f58f0ee203a3877a0fa6548b2546d home: https://promitor.io @@ -788,7 +751,7 @@ entries: version: 2.0.0-preview-3 - apiVersion: v1 appVersion: 2.0.0-preview-2 - created: "2022-10-06T11:00:50.574510186Z" + created: "2022-06-23T13:34:34.6244571+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 266d57a48054c0e8d89f2f945284b406bdf4d0cda117a6b9333c2408ff266d35 home: https://github.com/tomkerkhove/promitor @@ -802,7 +765,7 @@ entries: version: 2.0.0-preview-2 - apiVersion: v1 appVersion: 2.0.0-preview-1 - created: "2022-10-06T11:00:50.573881077Z" + created: "2022-06-23T13:34:34.616022+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: b201dd5d92dc647ddf28a38f9c6ffad286d01e5b78a292abb5009713ce280a7c home: https://github.com/tomkerkhove/promitor @@ -816,7 +779,7 @@ entries: version: 2.0.0-preview-1 - apiVersion: v1 appVersion: 1.6.1 - created: "2022-10-06T11:00:50.573251367Z" + created: "2022-06-23T13:34:34.6071629+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 2a1f2155b271acc1a938c736684483927101fd4873eff06870fb019e85ac02ff home: https://github.com/tomkerkhove/promitor @@ -830,7 +793,7 @@ entries: version: 1.6.1 - apiVersion: v1 appVersion: 1.6.1 - created: "2022-10-06T11:00:50.572670059Z" + created: "2022-06-23T13:34:34.5961789+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 51a41b5fd3b4bd8f7c3c97cbc05f8bc585b69745b4dbce79991d9e7d7d25087e home: https://github.com/tomkerkhove/promitor @@ -844,7 +807,7 @@ entries: version: 1.6.0 - apiVersion: v1 appVersion: 1.6.0-preview-1 - created: "2022-10-06T11:00:50.572026349Z" + created: "2022-06-23T13:34:34.5891803+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: daf2e355c8913b0cf481f184bd31e9ad8c2961acfe9999c235ac1f1795c475d1 home: https://github.com/tomkerkhove/promitor @@ -858,7 +821,7 @@ entries: version: 1.6.0-alpha - apiVersion: v1 appVersion: 1.5.0 - created: "2022-10-06T11:00:50.571435341Z" + created: "2022-06-23T13:34:34.5835032+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 3042053dc2a7765205478bbdf990fa786cd022e4f3a498831719b84fcce91b8b home: https://github.com/tomkerkhove/promitor @@ -872,7 +835,7 @@ entries: version: 1.4.0 - apiVersion: v1 appVersion: 1.3.0 - created: "2022-10-06T11:00:50.570898333Z" + created: "2022-06-23T13:34:34.5789295+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 9343b9fb8314fa05b08514c36460e22bc9d25e5b1b906a4e781bc15e97984759 home: https://github.com/tomkerkhove/promitor @@ -886,7 +849,7 @@ entries: version: 1.2.0 - apiVersion: v1 appVersion: 1.0.0 - created: "2022-10-06T11:00:50.570369325Z" + created: "2022-06-23T13:34:34.5735857+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 48f13defbd04718aa39885db29a82643920dbc6a634ae7b2629e3e1f48614c06 home: https://github.com/tomkerkhove/promitor @@ -900,7 +863,7 @@ entries: version: 1.1.0 - apiVersion: v1 appVersion: 1.0.0 - created: "2022-10-06T11:00:50.569812816Z" + created: "2022-06-23T13:34:34.5683272+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: f349c15865b53cd97be12c7d99eb4b32c563b135af5dd6b8929e8c3640737a15 home: https://github.com/tomkerkhove/promitor @@ -914,7 +877,7 @@ entries: version: 1.0.0 - apiVersion: v1 appVersion: 1.0.0-preview-8 - created: "2022-10-06T11:00:50.568576798Z" + created: "2022-06-23T13:34:34.5631077+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: ab8b8060a7cb856535e7109c54fcf180828d5f7b9a2afb3660d0ec63ee9900de home: https://github.com/tomkerkhove/promitor @@ -928,7 +891,7 @@ entries: version: 0.3.0 - apiVersion: v1 appVersion: 1.0.0-preview-6 - created: "2022-10-06T11:00:50.549991323Z" + created: "2022-06-23T13:34:34.557131+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: fafcd66eed4bd6b5ef27dac791c280632857ef0da8c25e7f29c112ae65bad001 home: https://github.com/tomkerkhove/promitor @@ -942,7 +905,7 @@ entries: version: 0.2.0 - apiVersion: v1 appVersion: 1.0.0-preview-5 - created: "2022-10-06T11:00:50.549492515Z" + created: "2022-06-23T13:34:34.5516892+02:00" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 789660228ecf452a4349109f8201fe438a4f16f98c2efa126eb5f910ec42e235 home: https://github.com/tomkerkhove/promitor @@ -951,4 +914,4 @@ entries: urls: - https://charts.promitor.io/promitor-agent-scraper-0.1.0.tgz version: 0.1.0 -generated: "2022-10-06T11:00:50.53361248Z" +generated: "2022-06-23T13:34:34.4045581+02:00" diff --git a/examples/promitor-agent-scraper.config.yaml b/examples/promitor-agent-scraper.config.yaml index f8f6f53..d2e05aa 100644 --- a/examples/promitor-agent-scraper.config.yaml +++ b/examples/promitor-agent-scraper.config.yaml @@ -6,22 +6,23 @@ metricSinks: metricUnavailableValue: -1 baseUriPath: /scrape enableServiceDiscovery: true - atlassianStatuspage: - pageId: y79z9b78ybgs - apiKey: - systemMetricMapping: - - id: nfkgnrwpn545 - promitorMetricName: promitor_demo_appplan_percentage_cpu + # atlassianStatuspage: + # pageId: y79z9b78ybgs + # apiKey: + # systemMetricMapping: + # - id: nfkgnrwpn545 + # promitorMetricName: promitor_demo_appplan_percentage_cpu azureMetadata: - tenantId: c8819874-9e56-4e3f-b1a8-1c0325138f27 - subscriptionId: 0f9d7fea-99e8-4768-8672-06a28514f77e - resourceGroupName: promitor + tenantId: 72f988bf-86f1-41af-91ab-2d7cd011db47 + subscriptionId: c5d1c552-a815-4fc8-b12d-ab444e3225b1 + #resourceGroupName: promitor +mdm: [] metricDefaults: aggregation: interval: 00:05:00 + limit: 10 scraping: - # Every minute - schedule: "0 * * ? * *" + schedule: "* * * * *" metrics: - name: promitor_demo_appplan_percentage_cpu description: "Average percentage of memory usage on an Azure App Plan" @@ -172,6 +173,6 @@ service: telemetry: defaultLogLevel: information resourceDiscovery: - host: promitor-agent-resource-discovery - port: 8889 enabled: true + host: "mgmt-promitor" + port: 8889 diff --git a/promitor-agent-resource-discovery/Chart.yaml b/promitor-agent-resource-discovery/Chart.yaml index d146532..47478e5 100644 --- a/promitor-agent-resource-discovery/Chart.yaml +++ b/promitor-agent-resource-discovery/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 0.8.1 +version: 0.8.0 appVersion: 0.8.0 type: application name: promitor-agent-resource-discovery diff --git a/promitor-agent-resource-discovery/README.md b/promitor-agent-resource-discovery/README.md index 256df6f..bcacde5 100644 --- a/promitor-agent-resource-discovery/README.md +++ b/promitor-agent-resource-discovery/README.md @@ -60,7 +60,6 @@ their default values. | `image.repository` | Repository which provides the image | `containers.promitor.io/tomkerkhove/promitor-agent-resource-discovery` | | `image.tag` | Tag of image to use | None, chart app version is used by default | | `image.pullPolicy` | Policy to pull image | `Always` | -| `image.pullSecrets` | ImagePullSecrets for the pod | `[]` | | `azureLandscape.cloud` | Azure Cloud to discover resources in. Options are `Global` (default), `China`, `UsGov` & `Germany` | `Global` | | `azureLandscape.tenantId` | Id of Azure tenant to discover resources in | | | `azureLandscape.subscriptions` | List of Azure subscription ids to discover resources in | `[]` | diff --git a/promitor-agent-resource-discovery/templates/deployment.yaml b/promitor-agent-resource-discovery/templates/deployment.yaml index d1cdeaf..9685c26 100644 --- a/promitor-agent-resource-discovery/templates/deployment.yaml +++ b/promitor-agent-resource-discovery/templates/deployment.yaml @@ -40,10 +40,6 @@ spec: {{- if .Values.rbac.create }} serviceAccountName: {{ template "promitor-agent-resource-discovery.serviceaccountname" . }} {{- end }} - {{- with .Values.image.pullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }} diff --git a/promitor-agent-resource-discovery/values.yaml b/promitor-agent-resource-discovery/values.yaml index 768d1a5..fefb39f 100644 --- a/promitor-agent-resource-discovery/values.yaml +++ b/promitor-agent-resource-discovery/values.yaml @@ -9,13 +9,13 @@ fullnameOverride: "" image: repository: containers.promitor.io/tomkerkhove/promitor-agent-resource-discovery pullPolicy: Always - pullSecrets: [] tag: azureAuthentication: appId: "" # [Deprecated] Prefer identity.id appKey: "" # [Deprecated] Prefer identity.key mode: "ServicePrincipal" + secretMountPath: "/vault-agent" identity: id: "" key: "" diff --git a/promitor-agent-scraper/Chart.yaml b/promitor-agent-scraper/Chart.yaml index c7bb0c9..dd2b723 100644 --- a/promitor-agent-scraper/Chart.yaml +++ b/promitor-agent-scraper/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -version: 2.9.0 -appVersion: 2.8.0 +version: 2.8.0 +appVersion: 2.7.0 type: application name: promitor-agent-scraper description: Promitor, bringing Azure Monitor metrics where you need them. diff --git a/promitor-agent-scraper/README.md b/promitor-agent-scraper/README.md index 247a98c..156d2cb 100644 --- a/promitor-agent-scraper/README.md +++ b/promitor-agent-scraper/README.md @@ -74,8 +74,6 @@ their default values. | `metricSinks.atlassianStatuspage.pageId` | Id of Atlassian Statuspage page | | | `metricSinks.atlassianStatuspage.apiKey` | API key of Atlassian Statuspage page | | | `metricSinks.atlassianStatuspage.systemMetricMapping` | Mapping of the Atlassian Statuspage system metrics and Promitor metrics. Learn how to configure it [below](#atlassian-statuspage).| None | -| `metricSinks.openTelemetryCollector.enabled` | Indication whether or not metrics should be pushed to an OpenTelemetry Collector | `false`| -| `metricSinks.openTelemetryCollector.collectorUri` | Uri of the OpenTelemetry Collector to push metrics to where the scraping endpoint for Prometheus is being exposed | `` | | `metricSinks.prometheusScrapingEndpoint.enabled` | Indication whether or not metrics should be exposed as a Prometheus scraping endpoint | `true`| | `metricSinks.prometheusScrapingEndpoint.baseUriPath` | Path where the scraping endpoint for Prometheus is being exposed | `/metrics` | | `metricSinks.prometheusScrapingEndpoint.enableMetricTimestamps` | Indication whether or not to include timestamp | `true` | @@ -109,9 +107,6 @@ their default values. | `metricDefaults.aggregation.interval` | Default interval which defines over what period measurements of a metric should be aggregated | `00:05:00` | | `metricDefaults.scraping.schedule` | Cron expression that controls the fequency in which all the configured metrics will be scraped from Azure Monitor | `*/5 * * * *` | | `metrics` | List of metrics to scrape configured following the [metric declaration docs](https://promitor.io/configuration/metrics/) | | -| `azureMonitor.logging.enabled` | Indication whether or not to provide logs on the integration with Azure Monitor and its APIs | `false` | -| `azureMonitor.logging.logLevel` | Minimum level of logging for Azure Monitor interactions | N/A | -| `azureMonitor.integration.history.startingFromInHours` | Defines the amount of hours Promitor will use to define the starting point of the time window used for metric queries. | N/A | | `rbac.create` | If true, create & use RBAC resources | `true` | | `rbac.podSecurityPolicyEnabled` | Create pod security policy resources | `false` | | `rbac.serviceAccount.create` | Create service account resource | `true` | diff --git a/promitor-agent-scraper/templates/configmap.yaml b/promitor-agent-scraper/templates/configmap.yaml index bf3caf8..31f4aff 100644 --- a/promitor-agent-scraper/templates/configmap.yaml +++ b/promitor-agent-scraper/templates/configmap.yaml @@ -18,6 +18,10 @@ data: {{- else if .Values.azureAuthentication.appId }} identityId: {{ .Values.azureAuthentication.appId}} {{- end }} + {{- if .Values.azureAuthentication.identity.appKeySecretFilePath }} + appKeySecretFilePath: {{ .Values.azureAuthentication.identity.appKeySecretFilePath}} + appKeySecretName: {{ .Values.azureAuthentication.identity.appKeySecretName}} + {{- end }} {{- if .Values.resourceDiscovery.enabled }} resourceDiscovery: host: {{ .Values.resourceDiscovery.host | quote }} @@ -30,14 +34,15 @@ data: {{- if .Values.metricSinks.statsd.port }} port: {{ .Values.metricSinks.statsd.port | quote }} {{- end }} + {{- if eq .Values.metricSinks.statsd.formattertype "custom" }} + account: {{ .Values.metricSinks.statsd.account | quote }} + namespace: {{ .Values.metricSinks.statsd.namespace | quote }} + formattertype: {{ .Values.metricSinks.statsd.formattertype | quote }} + {{- end }} {{- if .Values.metricSinks.statsd.metricPrefix }} metricPrefix: {{ .Values.metricSinks.statsd.metricPrefix | quote }} {{- end }} - {{- end }} - {{- if .Values.metricSinks.openTelemetryCollector.enabled }} - openTelemetryCollector: - collectorUri: {{ .Values.metricSinks.openTelemetryCollector.collectorUri | quote }} - {{- end }} + {{- end }} {{- if .Values.metricSinks.prometheusScrapingEndpoint.enabled }} prometheusScrapingEndpoint: metricUnavailableValue: {{ .Values.metricSinks.prometheusScrapingEndpoint.metricUnavailableValue | quote }} @@ -69,21 +74,6 @@ data: verbosity: {{ .Values.telemetry.containerLogs.logLevel | quote }} {{- end }} defaultVerbosity: {{ .Values.telemetry.defaultLogLevel | quote }} - {{- if or .Values.azureMonitor.logging.enabled .Values.azureMonitor.integration.history.startingFromInHours }} - azureMonitor: - {{- if .Values.azureMonitor.logging.enabled }} - logging: - {{- if .Values.azureMonitor.logging.logLevel }} - informationLevel: {{ .Values.azureMonitor.logging.logLevel | quote }} - {{- end }} - isEnabled: {{ .Values.azureMonitor.logging.enabled | quote }} - {{- end }} - {{- if .Values.azureMonitor.integration.history.startingFromInHours }} - integration: - history: - startingFromInHours: {{ .Values.azureMonitor.integration.history.startingFromInHours }} - {{- end }} - {{- end }} metrics-declaration.yaml: |- version: v1 azureMetadata: diff --git a/promitor-agent-scraper/templates/deployment.yaml b/promitor-agent-scraper/templates/deployment.yaml index e6252a8..2413317 100644 --- a/promitor-agent-scraper/templates/deployment.yaml +++ b/promitor-agent-scraper/templates/deployment.yaml @@ -4,6 +4,7 @@ metadata: name: {{ template "promitor-agent-scraper.name" . }} namespace: {{ .Release.Namespace }} labels: + aadpodidbinding: "cluster-identity" {{- include "promitor-agent-scraper.labels" . | nindent 4 }} {{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.Version }} annotations: @@ -22,6 +23,7 @@ spec: template: metadata: labels: + aadpodidbinding: "cluster-identity" {{- include "promitor-agent-scraper.selectorLabels" . | nindent 8 }} {{- if .Values.podLabels }} {{- toYaml .Values.podLabels | nindent 8 }} @@ -66,7 +68,194 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 6 }} {{- end }} + initContainers: + - name: keyvault-agent + image: "{{ .Values.image.acrUrl }}/{{ .Values.keyvault.acskeyvaultagent.image.name }}:{{ .Values.keyvault.acskeyvaultagent.image.tag }}" + env: + - name: DOWNLOAD_CA_CERTIFICATES + value: {{ .Values.keyvault.downloadCaCertificates | quote }} + - name: VAULT_BASE_URL + {{- if .Values.keyvault.vaultUrl }} + value: {{ .Values.keyvault.vaultUrl }} + {{- else }} + value: "https://{{ .Values.keyvault.vaultName }}.{{ .Values.keyvault.vaultUrlSuffix }}" + {{- end }} + - name: SECRETS_FOLDER + value: {{ .Values.keyvault.mountPath }} + - name: USE_MSI + value: "true" + {{- if .Values.airgap }} + - name: REQUESTS_CA_BUNDLE + value: {{ .Values.cacrtHostPath }} + {{- end }} + - name: SECRETS_KEYS + {{- $secrets := list }} + {{- if .Values.mdm.enabled }} + {{- $secrets = append $secrets .Values.mdm.secrets }} + {{- end }} + {{- if .Values.highThroughputPipeline.logs.enabled }} + {{- $secrets = append $secrets .Values.highThroughputPipeline.logs.mdsd.secrets }} + {{- end }} + {{- if .Values.keyvault.enabled }} + {{- $keyvaultSecrets := required "keyvault.secrets is missing" .Values.keyvault.secrets }} + {{- if kindIs "map" $keyvaultSecrets }} + {{- $secrets = append $secrets (values $keyvaultSecrets | join ";") }} + {{- else if kindIs "slice" $keyvaultSecrets }} + {{- $secrets = append $secrets ($keyvaultSecrets | join ";") }} + {{- else }} + {{- $secrets = append $secrets $keyvaultSecrets }} + {{- end }} + {{- end }} + value: {{ $secrets | join ";" }} + {{- if .Values.keyvault.azureAuthorityServer }} + - name: AZURE_AUTHORITY_SERVER + value: {{ .Values.keyvault.azureAuthorityServer }} + {{- end }} + - name: TIMEOUT + value: {{ .Values.keyvault.timeout | quote }} + {{- if .Values.keyvault.vaultResourceName }} + - name: VAULT_RESOURCE_NAME + value: {{ .Values.keyvault.vaultResourceName }} + {{- end }} + {{- range $key := .Values.keyvault.secretsBindedWithCa }} + - name: "{{ upper $key }}_DOWNLOAD_CA_CERTIFICATE" + value: "true" + {{- end }} + volumeMounts: + - name: {{ .Values.keyvault.volumeName }} + mountPath: {{ .Values.keyvault.mountPath }} + {{- if .Values.airgap }} + - name: sp-host + mountPath: {{ .Values.spHostPath }} + readOnly: true + - name: cacrt-host + mountPath: {{ .Values.cacrtHostPath }} + readOnly: true + {{- end }} + {{- if .Values.extraKeyvaults }} + {{- range $index, $extraKeyVault := .Values.extraKeyvaults }} + {{- if .enabled }} + - name: keyvault-agent-{{ $index }} + image: "{{ $.Values.image.acrUrl }}/{{ $.Values.keyvault.acskeyvaultagent.image.name }}:{{ $.Values.keyvault.acskeyvaultagent.image.tag }}" + env: + - name: DOWNLOAD_CA_CERTIFICATES + value: {{ .downloadCaCertificates | default false | quote }} + - name: VAULT_BASE_URL + {{- if .vaultUrl }} + value: {{ .vaultUrl }} + {{- else if .vaultName }} + value: "https://{{ .vaultName }}.{{ $.Values.keyvault.vaultUrlSuffix }}" + {{- else }} + {{ fail (printf "extraKeyvaults.%s.vaultUrl OR extraKeyvaults.%s.vaultName must be provided" $index $index) }} + {{- end }} + - name: SECRETS_FOLDER + value: {{ $.Values.keyvault.mountPath }} + - name: USE_MSI + value: "true" + {{- if $.Values.airgap }} + - name: REQUESTS_CA_BUNDLE + value: {{ $.Values.cacrtHostPath }} + {{- end }} + - name: SECRETS_KEYS + {{- $extraSecrets := list }} + {{- $extraKeyvaultSecrets := required (printf "extraKeyvaults.%s.secrets is missing" $index) .secrets }} + {{- if kindIs "map" $extraKeyvaultSecrets }} + {{- $extraSecrets = append $extraSecrets (values $extraKeyvaultSecrets | join ";") }} + {{- else if kindIs "slice" $extraKeyvaultSecrets }} + {{- $extraSecrets = append $extraSecrets ($extraKeyvaultSecrets | join ";") }} + {{- else }} + {{- $extraSecrets = append $extraSecrets $extraKeyvaultSecrets }} + {{- end }} + value: {{ $extraSecrets | join ";" }} + {{- if $.Values.keyvault.azureAuthorityServer }} + - name: AZURE_AUTHORITY_SERVER + value: {{ $.Values.keyvault.azureAuthorityServer }} + {{- end }} + - name: TIMEOUT + value: {{ $.Values.keyvault.timeout | quote }} + {{- if $.Values.keyvault.vaultResourceName}} + - name: VAULT_RESOURCE_NAME + value: {{ $.Values.keyvault.vaultResourceName }} + {{- end }} + volumeMounts: + - name: {{ $.Values.keyvault.volumeName }} + mountPath: {{ $.Values.keyvault.mountPath }} + {{- if $.Values.airgap }} + - name: sp-host + mountPath: {{ $.Values.spHostPath }} + readOnly: true + - name: cacrt-host + mountPath: {{ $.Values.cacrtHostPath }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} + {{- end }} containers: + - name: mdm + command: + - /start_metricsextension.sh + env: + - name: MDM_INPUT + value: {{ required "missing mdm protocol" .Values.mdm.protocol }} + - name: MDM_ACCOUNT + value: {{ required "missing mdm account name" .Values.mdm.account }} + {{- if .Values.mdm.infraMetricsEnrichment }} + - name: CONFIG_OVERRIDES_FILE + value: /mdm_config_override/mdm-config-overrides.json + {{- end }} + image: "{{ required "acrUrl is missing" .Values.mdm.acrUrl }}/{{ required "MDM image name (mdm.imageName) is missing" .Values.mdm.imageName }}:{{ required "MDM image tag (mdm.imageTag) is missing" .Values.mdm.imageTag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + livenessProbe: + failureThreshold: 3 + initialDelaySeconds: 15 + periodSeconds: 20 + successThreshold: 1 + tcpSocket: + port: {{ required "missing mdm port" .Values.mdm.port }} + timeoutSeconds: 1 + readinessProbe: + exec: + command: + - bash + - -c + - 'if ! [[ "$(ls -A /tmp/geneva_mdm/)" ]] || ! [[ "$(nc -vz localhost {{ required "missing mdm port" .Values.mdm.port }} 2>&1)" =~ .*open$ ]]; then exit 1; fi' + failureThreshold: 3 + initialDelaySeconds: 5 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + lifecycle: + postStart: + exec: + command: + - bash + - -c + - until [[ "$(ls -A /tmp/geneva_mdm/)" ]] && [[ "$(nc -vz localhost {{ required "missing mdm port" .Values.mdm.port }} 2>&1)" =~ .*open$ ]]; do sleep 1; done + {{- if or .Values.highThroughputPipeline.metrics.enabled .Values.mdm.appProcessName }} + {{- $processToMonitor := .Values.highThroughputPipeline.metrics.enabled | ternary "WDATP.Infra.EventsReader" .Values.mdm.appProcessName -}} + {{- /* + use preStop hook to add delay before SIGTERM is sent to mdm container, to enable 'flushing' of the application metrics from mdm-collector + */}} + preStop: + exec: + command: + - bash + - -c + - i=0; while [ $((i++)) -le 40 ] && pgrep -ifa {{ $processToMonitor | quote }} > /dev/null 2>&1; do sleep 1; done + {{- end }} + resources: +{{ .Values.mdm.resources | toYaml | indent 12 }} + volumeMounts: + - name: {{ .Values.keyvault.volumeName }} + mountPath: /tmp/geneva_mdm/ + readOnly: true + subPath: certs_keys + {{- if .Values.mdm.infraMetricsEnrichment }} + - name: mdm-config-overrides + mountPath: /mdm_config_override/ + readOnly: true + {{- end }} - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} @@ -99,7 +288,9 @@ spec: {{- if .Values.containerSecurityContext.enabled }} securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} {{- end }} - volumeMounts: + volumeMounts: + - name: {{ .Values.keyvault.volumeName }} + mountPath: {{ .Values.keyvault.mountPath }} - name: config-volume-{{ template "promitor-agent-scraper.name" . }} mountPath: /config/ {{- if and .Values.containerSecurityContext.enabled .Values.containerSecurityContext.readOnlyRootFilesystem }} @@ -138,6 +329,9 @@ spec: affinity: {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} volumes: + - name: {{ .Values.keyvault.volumeName }} + emptyDir: + medium: Memory # we want the secrets to reside only in-memory - name: config-volume-{{ template "promitor-agent-scraper.name" . }} configMap: name: config-map-{{ template "promitor-agent-scraper.name" . }} diff --git a/promitor-agent-scraper/templates/podidentity.yaml b/promitor-agent-scraper/templates/podidentity.yaml new file mode 100644 index 0000000..cc2252f --- /dev/null +++ b/promitor-agent-scraper/templates/podidentity.yaml @@ -0,0 +1,34 @@ +{{- if .Values.podIdentity.enabled -}} +{{- $resourceIdFormat := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.ManagedIdentity/userAssignedIdentities/%s" -}} +{{- $subscriptionId := (required "subscriptionId is missing" .Values.podIdentity.subscriptionId) -}} +{{- $resourceGroup := (required "resourceGroup is missing" .Values.podIdentity.resourceGroupName) -}} +{{- $azureIdentityName := (required "azureIdentityName is missing" .Values.podIdentity.azureIdentityName) -}} +{{- $resourceId := printf $resourceIdFormat $subscriptionId $resourceGroup $azureIdentityName -}} + +apiVersion: "aadpodidentity.k8s.io/v1" +kind: AzureIdentityBinding +metadata: + name: {{ .Release.Name }} + labels: + app.kubernetes.io/name: {{ template "wdatp-service.name" . }} + helm.sh/chart: {{ template "wdatp-service.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + azureIdentity: {{ .Release.Name }} + selector: {{ .Release.Name }} +--- +apiVersion: "aadpodidentity.k8s.io/v1" +kind: AzureIdentity +metadata: + name: {{ .Release.Name }} + labels: + app.kubernetes.io/name: {{ template "wdatp-service.name" . }} + helm.sh/chart: {{ template "wdatp-service.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + type: 0 + resourceID: {{ $resourceId }} + clientID: {{ required "azureIdentityClientId is missing" .Values.podIdentity.azureIdentityClientId | quote }} +{{- end -}} \ No newline at end of file diff --git a/promitor-agent-scraper/values.yaml b/promitor-agent-scraper/values.yaml index ab722ae..5c6ea62 100644 --- a/promitor-agent-scraper/values.yaml +++ b/promitor-agent-scraper/values.yaml @@ -6,20 +6,32 @@ replicaCount: 1 nameOverride: "" fullnameOverride: "" +imageAcrUrl: &imageAcrUrl wdatpacreus.azurecr.io + image: - repository: containers.promitor.io/tomkerkhove/promitor-agent-scraper + acrUrl: *imageAcrUrl + repository: wdatpacreus.azurecr.io/mgmt.promitor.scraper pullPolicy: Always pullSecrets: [] - tag: + tag: "20221020.3" azureAuthentication: appId: "" # [Deprecated] Prefer identity.id appKey: "" # [Deprecated] Prefer identity.key mode: "ServicePrincipal" identity: - id: "" - key: "" + id: c510fce5-b26b-4e58-b2ca-273820274ec6 + key: "" #P._8Q~hOPZukKSLpR87tFx~nXGLOd2c8P4QSwbup + appKeySecretFilePath: /vault-folder/secrets + appKeySecretName: wcd-vsts-stg-sp binding: "" + +azureMetadata: + tenantId: 72f988bf-86f1-41af-91ab-2d7cd011db47 + subscriptionId: c5d1c552-a815-4fc8-b12d-ab444e3225b1 + cloud: Global + resourceGroupName: promitor + metricSinks: atlassianStatuspage: enabled: false @@ -28,9 +40,6 @@ metricSinks: systemMetricMapping: [] # - id: # promitorMetricName: - openTelemetryCollector: - enabled: false - collectorUri: "" prometheusScrapingEndpoint: enabled: true baseUriPath: /metrics @@ -47,10 +56,13 @@ metricSinks: metricRelabelings: [] relabelings: [] statsd: - enabled: false - host: "" - port: 8125 - metricPrefix: "" + enabled: true + host: "localhost" + port: 8125 + namespace: "WCDSTGM365DSRE" + account: "WCDStaging" + formattertype: "custom" + prometheusRule: enabled: false namespace: "" @@ -68,32 +80,27 @@ prometheusRule: # description: | # Service {{ template "promitor-agent-scraper.name" . }} currently reports {{ "{{ $value }}" }} remaining calls before Azure Resource Manager throttles us. # summary: Azure Resource Manager may throttle us soon. -resourceDiscovery: - enabled: false - host: "" - port: 80 -telemetry: - defaultLogLevel: "Error" - applicationInsights: - enabled: false - key: "" - logLevel: "" - containerLogs: - enabled: true - logLevel: "" -## Metric Declaration YAML -azureMetadata: - tenantId: "" - subscriptionId: "" - resourceGroupName: promitor - cloud: "Global" + ## Metric Declaration YAML metricDefaults: aggregation: - interval: 00:05:00 + interval: 00:01:00 + limit: 10 scraping: - schedule: "*/5 * * * *" -metrics: [] + schedule: "*/3 * * * *" +metrics: + - name: azure_storage_account_capacity + description: "The average capacity used in the storage account" + resourceType: StorageAccount + azureMetricConfiguration: + metricName: UsedCapacity + aggregation: + type: Average + # resources: + # - accountName: abvc + resourceDiscoveryGroups: + - name: storage-accounts-landscape + description: "Goal nefesh" # Sample metric configuration below # - name: demo_queue_size # description: "Amount of active messages of the 'myqueue' queue (determined with ServiceBusQueue provider)" @@ -107,13 +114,20 @@ metrics: [] # - namespace: promitor-messaging # queueName: orders -azureMonitor: - logging: +resourceDiscovery: + enabled: true + host: "mgmt-promitor" + port: 8889 + +telemetry: + defaultLogLevel: "Error" + applicationInsights: enabled: false - logLevel: - integration: - history: - startingFromInHours: + key: "" + logLevel: "" + containerLogs: + enabled: true + logLevel: "" deployment: env: @@ -145,7 +159,7 @@ service: health: readiness: - enabled: true + enabled: false verifyDependencies: false delay: 5 interval: 5 @@ -154,7 +168,7 @@ health: failure: 3 success: 1 liveness: - enabled: true + enabled: false verifyDependencies: false delay: 5 interval: 30 @@ -171,13 +185,13 @@ annotations: {} priorityClassName: "" -resources: {} - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi +resources: + limits: + cpu: 500m + memory: 1024Mi + requests: + cpu: 500m + memory: 1024Mi ## Role-based access control ## https://kubernetes.io/docs/reference/access-authn-authz/rbac/ @@ -240,3 +254,95 @@ extraVolumes: [] # readOnly: true # volumeAttributes: # secretProviderClass: "promitor-secrets" + +environment: Staging + +# The image master_20220207-nc.1 just has `nc` over the image supplied by Geneva +# highThroughputPipeline: +# logs: +# mdsd: +# secrets: pfx-Geneva-STG::gcscert.pem:gcskey.pem +# gcs: +# account: WCDStaging +# environment: FirstPartyProd + +highThroughputPipeline: + imageName: "wdatp.infra.eventsreader" + imageTag: "20211218.1-d285ec723a95970419f42a32ea52a44e201c20e2" + # ! required by user ! + # genevaMdmNamespace: GenevaMdmNamespace + # ! required by user ! + # The following should be the name of the dll that you are monitoring + # AppName: myApp.dll + metrics: + enabled: false + resources: + limits: + cpu: 200m + memory: 256Mi + requests: + cpu: 200m + memory: 256Mi + circularBufferMB: 256 + appendMetricDisplayUnits: false + logs: + enabled: false + mdsd: + secrets: pfx-Geneva-STG::gcscert.pem:gcskey.pem + imageName: genevamdsd + imageTag: master_20220614.1-nc + # resources can be tuned. These values should handle 15k logs/s + resources: + limits: + cpu: 1500m + memory: 4Gi + requests: + cpu: 1500m + memory: 4Gi + backPressureBufferSizeInMB: 4096 + gcs: + account: WCDStaging + environment: FirstPartyProd + # secrets: common and set in /values folders + # ! required by user ! + # gcs: + # namespace: + # version: +keyvault: + enabled: true + vaultUrl: https://mgmt-runtime-stg-eus.vault.azure.net/ + acskeyvaultagent: + image: + name: wdatp.infra.keyvaultagent + tag: "20220410.2-375ce8621bbe0c5f9ece38e6dcd61436d9f92c5e" + mountPath: /vault-folder + volumeName: vault-folder + clusterServicePrincipalPath: /etc/kubernetes/azure.json + downloadCaCertificates: false + timeout: "60" + secrets: + - wcd-vsts-stg-sp + +### +# MDM +### + +mdm: + account: "WCDStaging" + secrets: pfx-Geneva-STG::mdm-cert.pem:mdm-key.pem + acrUrl: *imageAcrUrl + enabled: true + imageName: genevamdm + imageTag: master_20220614.1-nc + resources: + limits: + cpu: 200m + memory: 100Mi + requests: + cpu: 100m + memory: 100Mi + protocol: "ifx_tcp,statsd_udp" + port: 11013 + +podIdentity: + enabled: false From dd4ac3141ef0e25eff6a1ff295827ab3a50de690 Mon Sep 17 00:00:00 2001 From: arielhaim Date: Mon, 7 Nov 2022 09:38:14 +0200 Subject: [PATCH 2/3] fixed charts version --- README.md | 53 ++++- bla.json | 15 ++ config/scraper.yaml | 9 +- docs/index.yaml | 145 +++++++----- examples/promitor-agent-scraper.config.yaml | 27 ++- promitor-agent-resource-discovery/Chart.yaml | 2 +- promitor-agent-resource-discovery/README.md | 1 + .../templates/configmap.yaml | 4 + .../templates/deployment.yaml | 4 + promitor-agent-resource-discovery/values.yaml | 4 +- promitor-agent-scraper/Chart.yaml | 4 +- promitor-agent-scraper/README.md | 5 + .../templates/configmap.yaml | 23 +- .../templates/deployment.yaml | 196 +---------------- .../templates/podidentity.yaml | 34 --- promitor-agent-scraper/values.yaml | 207 +++++------------- 16 files changed, 265 insertions(+), 468 deletions(-) create mode 100644 bla.json delete mode 100644 promitor-agent-scraper/templates/podidentity.yaml diff --git a/README.md b/README.md index 8253809..d097639 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,52 @@ -az acr login -n wdatpacreus.azurecr.io +# Promitor - Helm Charts +[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/promitor)](https://artifacthub.io/packages/search?repo=promitor) -# run this from ./src folder -docker build . -t mdm-scraper-3 -f .\Promitor.Agents.Scraper\Dockerfile.linux -docker tag mdm-scraper-3 wdatpacreus.azurecr.io/mgmt.promitor.scraper:20220915.1 -docker push wdatpacreus.azurecr.io/mgmt.promitor.scraper:20220915.1 +Official Helm chart repository for Promitor. +## Documentation -helm upgrade --install mgmt-promitor-mdm promitor-agent-scraper -n management +All documentation is available on [docs.promitor.io](https://docs.promitor.io) +## Support + +Learn more about our support options [here](https://github.com/tomkerkhove/promitor/blob/master/SUPPORT.md). + +Thanks for those who are supporting us via [GitHub Sponsors](https://github.com/sponsors/tomkerkhove/). + +[![Carlo Garcia-Mier](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/CarloGarcia.jpg)](https://github.com/CarloGarcia) +[![Jorge Turrado Ferrero](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/JorTurFer.jpg)](https://github.com/JorTurFer) +[![Karl Ots](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/karlgots.jpg)](https://github.com/karlgots) +[![Loc Mai](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/locmai.jpg)](https://github.com/locmai) +[![Lovelace Engineering](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/LovelaceEngineering.png)](https://github.com/LovelaceEngineering) +[![Nills Franssens](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/nillsf.jpg)](https://github.com/NillsF) +[![Richard Simpson](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/RichiCoder1.jpg)](https://github.com/RichiCoder1) +[![Sam Vanhoutte](https://raw.githubusercontent.com/tomkerkhove/promitor/master//media/supporters/samvanhoutte.png)](https://github.com/samvanhoutte) + +## Security + +Learn more about our security policy [here](https://github.com/tomkerkhove/promitor/security/policy). + +## Donate + +Promitor is fully OSS and built free-of-charge, however, if you appreciate my work +you can do a small donation. + +[![Donate](https://img.shields.io/badge/Donate%20via-GitHub-blue.svg?style=flat-square)](https://github.com/sponsors/promitor) + +## Get in touch + +Do you have a security issue to report or just want to privately contact me? Feel +free to [write me an email](mailto:kerkhove.tom@gmail.com) or [get listed as a user](https://forms.gle/hjcpaaVFa1A1hZaK6). + +## Thank you + +We'd like to thank all the services, tooling & NuGet packages that support us - + [Thank you](https://promitor.io/thank-you)! + +## License Information + +This is licensed under The MIT License (MIT). Which means that you can use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies of the web +application. But you always need to state that Tom Kerkhove is the original author +of this web application. diff --git a/bla.json b/bla.json new file mode 100644 index 0000000..a7e381e --- /dev/null +++ b/bla.json @@ -0,0 +1,15 @@ +{ +"$schema":"https://ev2schema.azure.net/schemas/2020-01-01/scopeBindings.json", +"contentVersion":"1.0.0.0", +"scopeBindings":[ +{ +"scopeTagName":"SqlScriptsPath", +"bindings":[ +{ +"find":"__SQL_SCRIPTS_PATH__", +"replaceWith":"$(sqlScriptsPath)" +} +] +} +] +} \ No newline at end of file diff --git a/config/scraper.yaml b/config/scraper.yaml index f80acb9..2ddc6bc 100644 --- a/config/scraper.yaml +++ b/config/scraper.yaml @@ -1,10 +1,9 @@ runtime: metricSinks: - # prometheusScrapingEndpoint: - # metricUnavailableValue: -1 - # enableMetricTimestamps: true # true by default - # baseUriPath: /scrape - mdm: [] + prometheusScrapingEndpoint: + metricUnavailableValue: -1 + enableMetricTimestamps: true # true by default + baseUriPath: /scrape # metricsConfiguration: # absolutePath: /config/metrics-declaration.yaml azureMetadata: diff --git a/docs/index.yaml b/docs/index.yaml index 2dbf5bb..77f62d5 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,7 +3,26 @@ entries: promitor-agent-resource-discovery: - apiVersion: v2 appVersion: 0.8.0 - created: "2022-06-23T13:34:34.5434943+02:00" + created: "2022-10-06T11:00:50.54914101Z" + description: Automatically discover Azure resources to be scraped by Promitor + Scraper agent. + digest: 5370fdf64f9f5641b4820556b450f433dc6808836236aa75dad4ca253af59aee + home: https://promitor.io + icon: https://raw.githubusercontent.com/tomkerkhove/promitor/master/docs/media/logos/promitor.png + maintainers: + - name: Tom Kerkhove + url: https://github.com/tomkerkhove + name: promitor-agent-resource-discovery + sources: + - https://github.com/tomkerkhove/promitor + - https://github.com/promitor/charts + type: application + urls: + - https://charts.promitor.io/promitor-agent-resource-discovery-0.8.1.tgz + version: 0.8.1 + - apiVersion: v2 + appVersion: 0.8.0 + created: "2022-10-06T11:00:50.548350499Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 3e644bbd0340bd6429c37b2e4c7a044c82e99d370cba80b266d35f065f031487 @@ -22,7 +41,7 @@ entries: version: 0.8.0 - apiVersion: v2 appVersion: 0.7.1 - created: "2022-06-23T13:34:34.5424927+02:00" + created: "2022-10-06T11:00:50.547199081Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 21afb7e7df877cbf7dc0e373c6324b51b6fd08f4c630b991c14afbc61a5af024 @@ -41,7 +60,7 @@ entries: version: 0.7.5 - apiVersion: v2 appVersion: 0.7.1 - created: "2022-06-23T13:34:34.5332451+02:00" + created: "2022-10-06T11:00:50.546217367Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 6f0bf49cc3babe34ef96377830381fe83dca59e4f57bd26111296ab9e5e2a9f1 @@ -60,7 +79,7 @@ entries: version: 0.7.4 - apiVersion: v2 appVersion: 0.7.1 - created: "2022-06-23T13:34:34.5278468+02:00" + created: "2022-10-06T11:00:50.545431955Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 24cb982511b8ecf2dd9f71872a486540cd8ae61cc7ecfd6871a00561b86f6187 @@ -79,7 +98,7 @@ entries: version: 0.7.3 - apiVersion: v2 appVersion: 0.7.0 - created: "2022-06-23T13:34:34.5220859+02:00" + created: "2022-10-06T11:00:50.544652944Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: f5937fe48519dd49bec702a0073036c181f13f196a8ea1aa428989369b3e7559 @@ -98,7 +117,7 @@ entries: version: 0.7.2 - apiVersion: v2 appVersion: 0.7.0 - created: "2022-06-23T13:34:34.510758+02:00" + created: "2022-10-06T11:00:50.543919133Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 044ff8f49bb248dd0bd6d08e496c71104143469450dd093e60cd6c5975cbc830 @@ -117,7 +136,7 @@ entries: version: 0.7.1 - apiVersion: v2 appVersion: 0.7.0 - created: "2022-06-23T13:34:34.4951774+02:00" + created: "2022-10-06T11:00:50.543112321Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: b687baf96e770030e9be4d35fe38a9d40ab9469f9dae8e91549461a34034b02d @@ -136,7 +155,7 @@ entries: version: 0.7.0 - apiVersion: v2 appVersion: 0.6.0 - created: "2022-06-23T13:34:34.4831745+02:00" + created: "2022-10-06T11:00:50.542224308Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 574ef36ae899031a99034b1b7df0dd0d4e222c2f193295b34408782d03a5e1af @@ -155,7 +174,7 @@ entries: version: 0.6.0 - apiVersion: v2 appVersion: 0.5.0 - created: "2022-06-23T13:34:34.4713912+02:00" + created: "2022-10-06T11:00:50.541360995Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 279700c3a164166d99da1c77c3970a769a68187629f86099ef3f918c55c5e12e @@ -174,7 +193,7 @@ entries: version: 0.5.0 - apiVersion: v2 appVersion: 0.4.1 - created: "2022-06-23T13:34:34.4573012+02:00" + created: "2022-10-06T11:00:50.539291764Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 402804b870f74710577394342639aa814ab0e3e9fce9273c4f455118bce49780 @@ -193,7 +212,7 @@ entries: version: 0.4.1 - apiVersion: v2 appVersion: 0.4.0 - created: "2022-06-23T13:34:34.4493068+02:00" + created: "2022-10-06T11:00:50.538486852Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 7201436c7df8b1cd4fa151a02d6c642bc1d76f01ec6a3f4e412dabbd451c02ba @@ -212,7 +231,7 @@ entries: version: 0.4.0 - apiVersion: v2 appVersion: 0.3.0 - created: "2022-06-23T13:34:34.4383039+02:00" + created: "2022-10-06T11:00:50.53766904Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 202e7e1916c938101a1a3629f3b97d459c12aae1eb4c569d7e0efbe46946ff51 @@ -231,7 +250,7 @@ entries: version: 0.3.0 - apiVersion: v2 appVersion: 0.2.0 - created: "2022-06-23T13:34:34.4318822+02:00" + created: "2022-10-06T11:00:50.536841928Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: c206a387cdb2cf35737a772647e614530d5f1590963a15191840f5079798a3ce @@ -250,7 +269,7 @@ entries: version: 0.2.0 - apiVersion: v2 appVersion: 0.1.0 - created: "2022-06-23T13:34:34.4251541+02:00" + created: "2022-10-06T11:00:50.536116217Z" description: Automatically discover Azure resources to be scraped by Promitor Scraper agent. digest: 41ab73a2c05df5412e6b2debe8e2694aee05c430f39e3224988defc7ff79bf5b @@ -269,7 +288,7 @@ entries: version: 0.1.0 - apiVersion: v2 appVersion: 0.1.0-rc-2 - created: "2022-06-23T13:34:34.4126905+02:00" + created: "2022-10-06T11:00:50.534524694Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 9c867d55e15d9c1ab9bfe7c461b5e8bf7a2338b696923a2928a8a90d641d73b7 home: https://promitor.io @@ -286,7 +305,7 @@ entries: version: 0.1.0-rc-2 - apiVersion: v2 appVersion: 0.1.0-rc - created: "2022-06-23T13:34:34.4196071+02:00" + created: "2022-10-06T11:00:50.535170303Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: e0b656e263fec6b1af59a67ba842e486a5f7f6917424ebf78a97d16610cad0b8 home: https://promitor.io @@ -302,9 +321,27 @@ entries: - https://charts.promitor.io/promitor-agent-resource-discovery-0.1.0-rc.tgz version: 0.1.0-rc promitor-agent-scraper: + - apiVersion: v2 + appVersion: 2.8.0 + created: "2022-10-06T11:00:50.600639773Z" + description: Promitor, bringing Azure Monitor metrics where you need them. + digest: 6fae193b93bfdb014d728f92c25dd8ec0341719b8654d1377909ce08dd03d815 + home: https://promitor.io + icon: https://raw.githubusercontent.com/tomkerkhove/promitor/master/docs/media/logos/promitor.png + maintainers: + - name: Tom Kerkhove + url: https://github.com/tomkerkhove + name: promitor-agent-scraper + sources: + - https://github.com/tomkerkhove/promitor + - https://github.com/promitor/charts + type: application + urls: + - https://charts.promitor.io/promitor-agent-scraper-2.9.0.tgz + version: 2.9.0 - apiVersion: v2 appVersion: 2.7.0 - created: "2022-06-23T13:34:34.8930641+02:00" + created: "2022-10-06T11:00:50.599586658Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 2de55fbf04d3208680ea071d09e21046d033587658e81be49a20cc9fdfb81e7f home: https://promitor.io @@ -322,7 +359,7 @@ entries: version: 2.8.0 - apiVersion: v2 appVersion: 2.6.1 - created: "2022-06-23T13:34:34.8915586+02:00" + created: "2022-10-06T11:00:50.598474941Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: bbb86984b503549933aaa5456324a4e6cb3a99ee2c6cacc84da292b098fffd67 home: https://promitor.io @@ -340,7 +377,7 @@ entries: version: 2.7.4 - apiVersion: v2 appVersion: 2.6.1 - created: "2022-06-23T13:34:34.8869019+02:00" + created: "2022-10-06T11:00:50.597351325Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: e33e9719a4928f8cb9c8fddad51d832dfe8fd64afa06cd6e05bac130fbbbca94 home: https://promitor.io @@ -358,7 +395,7 @@ entries: version: 2.7.3 - apiVersion: v2 appVersion: 2.6.0 - created: "2022-06-23T13:34:34.8804551+02:00" + created: "2022-10-06T11:00:50.596249108Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 1df9b09fabe0d5ea78c77c85672b9b0c37cd26411f22571c45b5721bad02ae18 home: https://promitor.io @@ -376,7 +413,7 @@ entries: version: 2.7.2 - apiVersion: v2 appVersion: 2.6.0 - created: "2022-06-23T13:34:34.8747153+02:00" + created: "2022-10-06T11:00:50.594969489Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: af7022165bdadca08858330285f2961f67092b198c7100de0bbcfbf12c051105 home: https://promitor.io @@ -394,7 +431,7 @@ entries: version: 2.7.1 - apiVersion: v2 appVersion: 2.6.0 - created: "2022-06-23T13:34:34.8688205+02:00" + created: "2022-10-06T11:00:50.593916474Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: bcddf71b8d15f9b85111844d9f12926daca22e34d134ab253b2ba6ae0af7a026 home: https://promitor.io @@ -412,7 +449,7 @@ entries: version: 2.7.0 - apiVersion: v2 appVersion: 2.5.1 - created: "2022-06-23T13:34:34.8630276+02:00" + created: "2022-10-06T11:00:50.592913259Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 843cc6911a616ba91bfdaac57197db410cb53f9257f666b3be5b43ec69b42608 home: https://promitor.io @@ -430,7 +467,7 @@ entries: version: 2.6.3 - apiVersion: v2 appVersion: 2.5.1 - created: "2022-06-23T13:34:34.8554959+02:00" + created: "2022-10-06T11:00:50.591926444Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 1f7640545533f9486b4fb41836ac0ef2a29b953a0234ef0a163ad9ed035d60f6 home: https://promitor.io @@ -448,7 +485,7 @@ entries: version: 2.6.2 - apiVersion: v2 appVersion: 2.5.1 - created: "2022-06-23T13:34:34.8490348+02:00" + created: "2022-10-06T11:00:50.590912429Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: eab8ef204f1d05969fb78b36ccd7aaefa50d883bf70484c58603ef10c2124af9 home: https://promitor.io @@ -466,7 +503,7 @@ entries: version: 2.6.1 - apiVersion: v2 appVersion: 2.5.0 - created: "2022-06-23T13:34:34.8403879+02:00" + created: "2022-10-06T11:00:50.588733497Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: b9f4570035093e4ae1d5230d5086befdea2911ec41b9221df7135dbe91dfb13d home: https://promitor.io @@ -484,7 +521,7 @@ entries: version: 2.6.0 - apiVersion: v2 appVersion: 2.4.0 - created: "2022-06-23T13:34:34.8235641+02:00" + created: "2022-10-06T11:00:50.587811583Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: e94aeb714c867a6715c6e6acceec6d1e24d9bf7aecc6aabb6307dcc038fcb718 home: https://promitor.io @@ -502,7 +539,7 @@ entries: version: 2.5.1 - apiVersion: v2 appVersion: 2.4.0 - created: "2022-06-23T13:34:34.8079298+02:00" + created: "2022-10-06T11:00:50.58692167Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: b71ef0bfec7364b10648c84c53b718e0338f4d58f7fe6698147a1b9290ea9abf home: https://promitor.io @@ -520,7 +557,7 @@ entries: version: 2.5.0 - apiVersion: v2 appVersion: 2.3.0 - created: "2022-06-23T13:34:34.7894661+02:00" + created: "2022-10-06T11:00:50.586074857Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: d57eadb9d6bc80aa3d841f6e39025b20cd0260582ca1d3a2c24ff9f365f7ba34 home: https://promitor.io @@ -538,7 +575,7 @@ entries: version: 2.4.3 - apiVersion: v2 appVersion: 2.3.0 - created: "2022-06-23T13:34:34.7725325+02:00" + created: "2022-10-06T11:00:50.585170144Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 3e4bca591350c79133347f04a9091b3fd06744fdaefe536a543c4262d93bc6c6 home: https://promitor.io @@ -556,7 +593,7 @@ entries: version: 2.4.2 - apiVersion: v2 appVersion: 2.3.0 - created: "2022-06-23T13:34:34.7576909+02:00" + created: "2022-10-06T11:00:50.584309431Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: a781247f01cf3c1a1c27361fffd46c38a27483b1508f3bc888805fc1977ddbdb home: https://promitor.io @@ -574,7 +611,7 @@ entries: version: 2.4.1 - apiVersion: v2 appVersion: 2.3.0 - created: "2022-06-23T13:34:34.7415438+02:00" + created: "2022-10-06T11:00:50.583480819Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 012301d7961d219c94aa494f13b526a358313089eec81ab2d2fbed2578fd1263 home: https://promitor.io @@ -592,7 +629,7 @@ entries: version: 2.4.0 - apiVersion: v2 appVersion: 2.2.0 - created: "2022-06-23T13:34:34.729962+02:00" + created: "2022-10-06T11:00:50.582633606Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: d2a11eccf620a7d310cd760a3ec590be3dfbc43fbba329f724ea144ff6f125c6 home: https://promitor.io @@ -610,7 +647,7 @@ entries: version: 2.3.0 - apiVersion: v2 appVersion: 2.1.1 - created: "2022-06-23T13:34:34.7210093+02:00" + created: "2022-10-06T11:00:50.581752793Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 946142bf80bd62d85c4c818f232c4e8a640f48d76e7a0854d16d143179044a08 home: https://promitor.io @@ -628,7 +665,7 @@ entries: version: 2.2.2 - apiVersion: v2 appVersion: 2.1.0 - created: "2022-06-23T13:34:34.7091571+02:00" + created: "2022-10-06T11:00:50.580806179Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 0fd0eac74a82c9741c84a2728ca2d5e173fa29ae4ce2056b7f41ac88120e75ea home: https://promitor.io @@ -646,7 +683,7 @@ entries: version: 2.2.1 - apiVersion: v2 appVersion: 2.1.0 - created: "2022-06-23T13:34:34.6961603+02:00" + created: "2022-10-06T11:00:50.579822165Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 85a89c6109f53fc2fbfaca66fb562bb84e4bb827c0166e4a71d8ef919cfecbb6 home: https://promitor.io @@ -664,7 +701,7 @@ entries: version: 2.2.0 - apiVersion: v2 appVersion: 2.0.0 - created: "2022-06-23T13:34:34.6829279+02:00" + created: "2022-10-06T11:00:50.577964437Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 2cda4a464fc7557598d0e672862bcafc436f927257d2eff358b0b756cc2baf30 home: https://promitor.io @@ -682,7 +719,7 @@ entries: version: 2.1.0 - apiVersion: v2 appVersion: 2.0.0 - created: "2022-06-23T13:34:34.6712345+02:00" + created: "2022-10-06T11:00:50.577204226Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: 610f22aeaede52044e7a2979f9c8935884d9e4885e1b7a22cc52a8fe10893a18 home: https://promitor.io @@ -700,7 +737,7 @@ entries: version: 2.0.0 - apiVersion: v2 appVersion: 2.0.0-rc-2 - created: "2022-06-23T13:34:34.6465401+02:00" + created: "2022-10-06T11:00:50.575850406Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: f8e455f8e216d22fb935fe6ac0d67a99dd67cf3608df6d3c1ebbccd297f4e8c8 home: https://promitor.io @@ -717,7 +754,7 @@ entries: version: 2.0.0-rc-2 - apiVersion: v2 appVersion: 2.0.0-rc - created: "2022-06-23T13:34:34.6606081+02:00" + created: "2022-10-06T11:00:50.576514316Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: fb98e45ff316fc3af85a050edae9ecd02c1a1f379eed28d6a6dfe28b4f61d1fe home: https://promitor.io @@ -734,7 +771,7 @@ entries: version: 2.0.0-rc - apiVersion: v2 appVersion: 2.0.0-preview-3 - created: "2022-06-23T13:34:34.6396811+02:00" + created: "2022-10-06T11:00:50.575161096Z" description: Promitor, bringing Azure Monitor metrics where you need them. digest: c339ca4b67df12eadcce807bd7bea0fed12f58f0ee203a3877a0fa6548b2546d home: https://promitor.io @@ -751,7 +788,7 @@ entries: version: 2.0.0-preview-3 - apiVersion: v1 appVersion: 2.0.0-preview-2 - created: "2022-06-23T13:34:34.6244571+02:00" + created: "2022-10-06T11:00:50.574510186Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 266d57a48054c0e8d89f2f945284b406bdf4d0cda117a6b9333c2408ff266d35 home: https://github.com/tomkerkhove/promitor @@ -765,7 +802,7 @@ entries: version: 2.0.0-preview-2 - apiVersion: v1 appVersion: 2.0.0-preview-1 - created: "2022-06-23T13:34:34.616022+02:00" + created: "2022-10-06T11:00:50.573881077Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: b201dd5d92dc647ddf28a38f9c6ffad286d01e5b78a292abb5009713ce280a7c home: https://github.com/tomkerkhove/promitor @@ -779,7 +816,7 @@ entries: version: 2.0.0-preview-1 - apiVersion: v1 appVersion: 1.6.1 - created: "2022-06-23T13:34:34.6071629+02:00" + created: "2022-10-06T11:00:50.573251367Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 2a1f2155b271acc1a938c736684483927101fd4873eff06870fb019e85ac02ff home: https://github.com/tomkerkhove/promitor @@ -793,7 +830,7 @@ entries: version: 1.6.1 - apiVersion: v1 appVersion: 1.6.1 - created: "2022-06-23T13:34:34.5961789+02:00" + created: "2022-10-06T11:00:50.572670059Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 51a41b5fd3b4bd8f7c3c97cbc05f8bc585b69745b4dbce79991d9e7d7d25087e home: https://github.com/tomkerkhove/promitor @@ -807,7 +844,7 @@ entries: version: 1.6.0 - apiVersion: v1 appVersion: 1.6.0-preview-1 - created: "2022-06-23T13:34:34.5891803+02:00" + created: "2022-10-06T11:00:50.572026349Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: daf2e355c8913b0cf481f184bd31e9ad8c2961acfe9999c235ac1f1795c475d1 home: https://github.com/tomkerkhove/promitor @@ -821,7 +858,7 @@ entries: version: 1.6.0-alpha - apiVersion: v1 appVersion: 1.5.0 - created: "2022-06-23T13:34:34.5835032+02:00" + created: "2022-10-06T11:00:50.571435341Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 3042053dc2a7765205478bbdf990fa786cd022e4f3a498831719b84fcce91b8b home: https://github.com/tomkerkhove/promitor @@ -835,7 +872,7 @@ entries: version: 1.4.0 - apiVersion: v1 appVersion: 1.3.0 - created: "2022-06-23T13:34:34.5789295+02:00" + created: "2022-10-06T11:00:50.570898333Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 9343b9fb8314fa05b08514c36460e22bc9d25e5b1b906a4e781bc15e97984759 home: https://github.com/tomkerkhove/promitor @@ -849,7 +886,7 @@ entries: version: 1.2.0 - apiVersion: v1 appVersion: 1.0.0 - created: "2022-06-23T13:34:34.5735857+02:00" + created: "2022-10-06T11:00:50.570369325Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 48f13defbd04718aa39885db29a82643920dbc6a634ae7b2629e3e1f48614c06 home: https://github.com/tomkerkhove/promitor @@ -863,7 +900,7 @@ entries: version: 1.1.0 - apiVersion: v1 appVersion: 1.0.0 - created: "2022-06-23T13:34:34.5683272+02:00" + created: "2022-10-06T11:00:50.569812816Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: f349c15865b53cd97be12c7d99eb4b32c563b135af5dd6b8929e8c3640737a15 home: https://github.com/tomkerkhove/promitor @@ -877,7 +914,7 @@ entries: version: 1.0.0 - apiVersion: v1 appVersion: 1.0.0-preview-8 - created: "2022-06-23T13:34:34.5631077+02:00" + created: "2022-10-06T11:00:50.568576798Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: ab8b8060a7cb856535e7109c54fcf180828d5f7b9a2afb3660d0ec63ee9900de home: https://github.com/tomkerkhove/promitor @@ -891,7 +928,7 @@ entries: version: 0.3.0 - apiVersion: v1 appVersion: 1.0.0-preview-6 - created: "2022-06-23T13:34:34.557131+02:00" + created: "2022-10-06T11:00:50.549991323Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: fafcd66eed4bd6b5ef27dac791c280632857ef0da8c25e7f29c112ae65bad001 home: https://github.com/tomkerkhove/promitor @@ -905,7 +942,7 @@ entries: version: 0.2.0 - apiVersion: v1 appVersion: 1.0.0-preview-5 - created: "2022-06-23T13:34:34.5516892+02:00" + created: "2022-10-06T11:00:50.549492515Z" description: A Helm chart to deploy Promitor, an Azure Monitor scraper for Prometheus digest: 789660228ecf452a4349109f8201fe438a4f16f98c2efa126eb5f910ec42e235 home: https://github.com/tomkerkhove/promitor @@ -914,4 +951,4 @@ entries: urls: - https://charts.promitor.io/promitor-agent-scraper-0.1.0.tgz version: 0.1.0 -generated: "2022-06-23T13:34:34.4045581+02:00" +generated: "2022-10-06T11:00:50.53361248Z" diff --git a/examples/promitor-agent-scraper.config.yaml b/examples/promitor-agent-scraper.config.yaml index d2e05aa..f8f6f53 100644 --- a/examples/promitor-agent-scraper.config.yaml +++ b/examples/promitor-agent-scraper.config.yaml @@ -6,23 +6,22 @@ metricSinks: metricUnavailableValue: -1 baseUriPath: /scrape enableServiceDiscovery: true - # atlassianStatuspage: - # pageId: y79z9b78ybgs - # apiKey: - # systemMetricMapping: - # - id: nfkgnrwpn545 - # promitorMetricName: promitor_demo_appplan_percentage_cpu + atlassianStatuspage: + pageId: y79z9b78ybgs + apiKey: + systemMetricMapping: + - id: nfkgnrwpn545 + promitorMetricName: promitor_demo_appplan_percentage_cpu azureMetadata: - tenantId: 72f988bf-86f1-41af-91ab-2d7cd011db47 - subscriptionId: c5d1c552-a815-4fc8-b12d-ab444e3225b1 - #resourceGroupName: promitor -mdm: [] + tenantId: c8819874-9e56-4e3f-b1a8-1c0325138f27 + subscriptionId: 0f9d7fea-99e8-4768-8672-06a28514f77e + resourceGroupName: promitor metricDefaults: aggregation: interval: 00:05:00 - limit: 10 scraping: - schedule: "* * * * *" + # Every minute + schedule: "0 * * ? * *" metrics: - name: promitor_demo_appplan_percentage_cpu description: "Average percentage of memory usage on an Azure App Plan" @@ -173,6 +172,6 @@ service: telemetry: defaultLogLevel: information resourceDiscovery: - enabled: true - host: "mgmt-promitor" + host: promitor-agent-resource-discovery port: 8889 + enabled: true diff --git a/promitor-agent-resource-discovery/Chart.yaml b/promitor-agent-resource-discovery/Chart.yaml index 47478e5..d146532 100644 --- a/promitor-agent-resource-discovery/Chart.yaml +++ b/promitor-agent-resource-discovery/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -version: 0.8.0 +version: 0.8.1 appVersion: 0.8.0 type: application name: promitor-agent-resource-discovery diff --git a/promitor-agent-resource-discovery/README.md b/promitor-agent-resource-discovery/README.md index bcacde5..256df6f 100644 --- a/promitor-agent-resource-discovery/README.md +++ b/promitor-agent-resource-discovery/README.md @@ -60,6 +60,7 @@ their default values. | `image.repository` | Repository which provides the image | `containers.promitor.io/tomkerkhove/promitor-agent-resource-discovery` | | `image.tag` | Tag of image to use | None, chart app version is used by default | | `image.pullPolicy` | Policy to pull image | `Always` | +| `image.pullSecrets` | ImagePullSecrets for the pod | `[]` | | `azureLandscape.cloud` | Azure Cloud to discover resources in. Options are `Global` (default), `China`, `UsGov` & `Germany` | `Global` | | `azureLandscape.tenantId` | Id of Azure tenant to discover resources in | | | `azureLandscape.subscriptions` | List of Azure subscription ids to discover resources in | `[]` | diff --git a/promitor-agent-resource-discovery/templates/configmap.yaml b/promitor-agent-resource-discovery/templates/configmap.yaml index a1a9d5b..f803944 100644 --- a/promitor-agent-resource-discovery/templates/configmap.yaml +++ b/promitor-agent-resource-discovery/templates/configmap.yaml @@ -26,6 +26,10 @@ data: applicationInsights: {{- if .Values.telemetry.applicationInsights.key }} instrumentationKey: {{ .Values.telemetry.applicationInsights.key | quote }} + {{- end }} + {{- if .Values.azureAuthentication.identity.appKeySecretFilePath }} + appKeySecretFilePath: {{ .Values.azureAuthentication.identity.appKeySecretFilePath}} + appKeySecretName: {{ .Values.azureAuthentication.identity.appKeySecretName}} {{- end }} isEnabled: {{ .Values.telemetry.applicationInsights.enabled | quote }} {{- if .Values.telemetry.applicationInsights.logLevel }} diff --git a/promitor-agent-resource-discovery/templates/deployment.yaml b/promitor-agent-resource-discovery/templates/deployment.yaml index 9685c26..d1cdeaf 100644 --- a/promitor-agent-resource-discovery/templates/deployment.yaml +++ b/promitor-agent-resource-discovery/templates/deployment.yaml @@ -40,6 +40,10 @@ spec: {{- if .Values.rbac.create }} serviceAccountName: {{ template "promitor-agent-resource-discovery.serviceaccountname" . }} {{- end }} + {{- with .Values.image.pullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }} diff --git a/promitor-agent-resource-discovery/values.yaml b/promitor-agent-resource-discovery/values.yaml index fefb39f..3e28b4e 100644 --- a/promitor-agent-resource-discovery/values.yaml +++ b/promitor-agent-resource-discovery/values.yaml @@ -9,16 +9,18 @@ fullnameOverride: "" image: repository: containers.promitor.io/tomkerkhove/promitor-agent-resource-discovery pullPolicy: Always + pullSecrets: [] tag: azureAuthentication: appId: "" # [Deprecated] Prefer identity.id appKey: "" # [Deprecated] Prefer identity.key mode: "ServicePrincipal" - secretMountPath: "/vault-agent" identity: id: "" key: "" + appKeySecretFilePath: "" # The path to the secret file + appKeySecretFileName: "" # The file that contains the secret value binding: "" cache: diff --git a/promitor-agent-scraper/Chart.yaml b/promitor-agent-scraper/Chart.yaml index dd2b723..c7bb0c9 100644 --- a/promitor-agent-scraper/Chart.yaml +++ b/promitor-agent-scraper/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -version: 2.8.0 -appVersion: 2.7.0 +version: 2.9.0 +appVersion: 2.8.0 type: application name: promitor-agent-scraper description: Promitor, bringing Azure Monitor metrics where you need them. diff --git a/promitor-agent-scraper/README.md b/promitor-agent-scraper/README.md index 156d2cb..247a98c 100644 --- a/promitor-agent-scraper/README.md +++ b/promitor-agent-scraper/README.md @@ -74,6 +74,8 @@ their default values. | `metricSinks.atlassianStatuspage.pageId` | Id of Atlassian Statuspage page | | | `metricSinks.atlassianStatuspage.apiKey` | API key of Atlassian Statuspage page | | | `metricSinks.atlassianStatuspage.systemMetricMapping` | Mapping of the Atlassian Statuspage system metrics and Promitor metrics. Learn how to configure it [below](#atlassian-statuspage).| None | +| `metricSinks.openTelemetryCollector.enabled` | Indication whether or not metrics should be pushed to an OpenTelemetry Collector | `false`| +| `metricSinks.openTelemetryCollector.collectorUri` | Uri of the OpenTelemetry Collector to push metrics to where the scraping endpoint for Prometheus is being exposed | `` | | `metricSinks.prometheusScrapingEndpoint.enabled` | Indication whether or not metrics should be exposed as a Prometheus scraping endpoint | `true`| | `metricSinks.prometheusScrapingEndpoint.baseUriPath` | Path where the scraping endpoint for Prometheus is being exposed | `/metrics` | | `metricSinks.prometheusScrapingEndpoint.enableMetricTimestamps` | Indication whether or not to include timestamp | `true` | @@ -107,6 +109,9 @@ their default values. | `metricDefaults.aggregation.interval` | Default interval which defines over what period measurements of a metric should be aggregated | `00:05:00` | | `metricDefaults.scraping.schedule` | Cron expression that controls the fequency in which all the configured metrics will be scraped from Azure Monitor | `*/5 * * * *` | | `metrics` | List of metrics to scrape configured following the [metric declaration docs](https://promitor.io/configuration/metrics/) | | +| `azureMonitor.logging.enabled` | Indication whether or not to provide logs on the integration with Azure Monitor and its APIs | `false` | +| `azureMonitor.logging.logLevel` | Minimum level of logging for Azure Monitor interactions | N/A | +| `azureMonitor.integration.history.startingFromInHours` | Defines the amount of hours Promitor will use to define the starting point of the time window used for metric queries. | N/A | | `rbac.create` | If true, create & use RBAC resources | `true` | | `rbac.podSecurityPolicyEnabled` | Create pod security policy resources | `false` | | `rbac.serviceAccount.create` | Create service account resource | `true` | diff --git a/promitor-agent-scraper/templates/configmap.yaml b/promitor-agent-scraper/templates/configmap.yaml index 31f4aff..1dbb60b 100644 --- a/promitor-agent-scraper/templates/configmap.yaml +++ b/promitor-agent-scraper/templates/configmap.yaml @@ -34,7 +34,7 @@ data: {{- if .Values.metricSinks.statsd.port }} port: {{ .Values.metricSinks.statsd.port | quote }} {{- end }} - {{- if eq .Values.metricSinks.statsd.formattertype "custom" }} + {{- if eq .Values.metricSinks.statsd.formattertype "custom" }} account: {{ .Values.metricSinks.statsd.account | quote }} namespace: {{ .Values.metricSinks.statsd.namespace | quote }} formattertype: {{ .Values.metricSinks.statsd.formattertype | quote }} @@ -42,7 +42,11 @@ data: {{- if .Values.metricSinks.statsd.metricPrefix }} metricPrefix: {{ .Values.metricSinks.statsd.metricPrefix | quote }} {{- end }} - {{- end }} + {{- end }} + {{- if .Values.metricSinks.openTelemetryCollector.enabled }} + openTelemetryCollector: + collectorUri: {{ .Values.metricSinks.openTelemetryCollector.collectorUri | quote }} + {{- end }} {{- if .Values.metricSinks.prometheusScrapingEndpoint.enabled }} prometheusScrapingEndpoint: metricUnavailableValue: {{ .Values.metricSinks.prometheusScrapingEndpoint.metricUnavailableValue | quote }} @@ -74,6 +78,21 @@ data: verbosity: {{ .Values.telemetry.containerLogs.logLevel | quote }} {{- end }} defaultVerbosity: {{ .Values.telemetry.defaultLogLevel | quote }} + {{- if or .Values.azureMonitor.logging.enabled .Values.azureMonitor.integration.history.startingFromInHours }} + azureMonitor: + {{- if .Values.azureMonitor.logging.enabled }} + logging: + {{- if .Values.azureMonitor.logging.logLevel }} + informationLevel: {{ .Values.azureMonitor.logging.logLevel | quote }} + {{- end }} + isEnabled: {{ .Values.azureMonitor.logging.enabled | quote }} + {{- end }} + {{- if .Values.azureMonitor.integration.history.startingFromInHours }} + integration: + history: + startingFromInHours: {{ .Values.azureMonitor.integration.history.startingFromInHours }} + {{- end }} + {{- end }} metrics-declaration.yaml: |- version: v1 azureMetadata: diff --git a/promitor-agent-scraper/templates/deployment.yaml b/promitor-agent-scraper/templates/deployment.yaml index 2413317..e6252a8 100644 --- a/promitor-agent-scraper/templates/deployment.yaml +++ b/promitor-agent-scraper/templates/deployment.yaml @@ -4,7 +4,6 @@ metadata: name: {{ template "promitor-agent-scraper.name" . }} namespace: {{ .Release.Namespace }} labels: - aadpodidbinding: "cluster-identity" {{- include "promitor-agent-scraper.labels" . | nindent 4 }} {{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.Version }} annotations: @@ -23,7 +22,6 @@ spec: template: metadata: labels: - aadpodidbinding: "cluster-identity" {{- include "promitor-agent-scraper.selectorLabels" . | nindent 8 }} {{- if .Values.podLabels }} {{- toYaml .Values.podLabels | nindent 8 }} @@ -68,194 +66,7 @@ spec: tolerations: {{- toYaml .Values.tolerations | nindent 6 }} {{- end }} - initContainers: - - name: keyvault-agent - image: "{{ .Values.image.acrUrl }}/{{ .Values.keyvault.acskeyvaultagent.image.name }}:{{ .Values.keyvault.acskeyvaultagent.image.tag }}" - env: - - name: DOWNLOAD_CA_CERTIFICATES - value: {{ .Values.keyvault.downloadCaCertificates | quote }} - - name: VAULT_BASE_URL - {{- if .Values.keyvault.vaultUrl }} - value: {{ .Values.keyvault.vaultUrl }} - {{- else }} - value: "https://{{ .Values.keyvault.vaultName }}.{{ .Values.keyvault.vaultUrlSuffix }}" - {{- end }} - - name: SECRETS_FOLDER - value: {{ .Values.keyvault.mountPath }} - - name: USE_MSI - value: "true" - {{- if .Values.airgap }} - - name: REQUESTS_CA_BUNDLE - value: {{ .Values.cacrtHostPath }} - {{- end }} - - name: SECRETS_KEYS - {{- $secrets := list }} - {{- if .Values.mdm.enabled }} - {{- $secrets = append $secrets .Values.mdm.secrets }} - {{- end }} - {{- if .Values.highThroughputPipeline.logs.enabled }} - {{- $secrets = append $secrets .Values.highThroughputPipeline.logs.mdsd.secrets }} - {{- end }} - {{- if .Values.keyvault.enabled }} - {{- $keyvaultSecrets := required "keyvault.secrets is missing" .Values.keyvault.secrets }} - {{- if kindIs "map" $keyvaultSecrets }} - {{- $secrets = append $secrets (values $keyvaultSecrets | join ";") }} - {{- else if kindIs "slice" $keyvaultSecrets }} - {{- $secrets = append $secrets ($keyvaultSecrets | join ";") }} - {{- else }} - {{- $secrets = append $secrets $keyvaultSecrets }} - {{- end }} - {{- end }} - value: {{ $secrets | join ";" }} - {{- if .Values.keyvault.azureAuthorityServer }} - - name: AZURE_AUTHORITY_SERVER - value: {{ .Values.keyvault.azureAuthorityServer }} - {{- end }} - - name: TIMEOUT - value: {{ .Values.keyvault.timeout | quote }} - {{- if .Values.keyvault.vaultResourceName }} - - name: VAULT_RESOURCE_NAME - value: {{ .Values.keyvault.vaultResourceName }} - {{- end }} - {{- range $key := .Values.keyvault.secretsBindedWithCa }} - - name: "{{ upper $key }}_DOWNLOAD_CA_CERTIFICATE" - value: "true" - {{- end }} - volumeMounts: - - name: {{ .Values.keyvault.volumeName }} - mountPath: {{ .Values.keyvault.mountPath }} - {{- if .Values.airgap }} - - name: sp-host - mountPath: {{ .Values.spHostPath }} - readOnly: true - - name: cacrt-host - mountPath: {{ .Values.cacrtHostPath }} - readOnly: true - {{- end }} - {{- if .Values.extraKeyvaults }} - {{- range $index, $extraKeyVault := .Values.extraKeyvaults }} - {{- if .enabled }} - - name: keyvault-agent-{{ $index }} - image: "{{ $.Values.image.acrUrl }}/{{ $.Values.keyvault.acskeyvaultagent.image.name }}:{{ $.Values.keyvault.acskeyvaultagent.image.tag }}" - env: - - name: DOWNLOAD_CA_CERTIFICATES - value: {{ .downloadCaCertificates | default false | quote }} - - name: VAULT_BASE_URL - {{- if .vaultUrl }} - value: {{ .vaultUrl }} - {{- else if .vaultName }} - value: "https://{{ .vaultName }}.{{ $.Values.keyvault.vaultUrlSuffix }}" - {{- else }} - {{ fail (printf "extraKeyvaults.%s.vaultUrl OR extraKeyvaults.%s.vaultName must be provided" $index $index) }} - {{- end }} - - name: SECRETS_FOLDER - value: {{ $.Values.keyvault.mountPath }} - - name: USE_MSI - value: "true" - {{- if $.Values.airgap }} - - name: REQUESTS_CA_BUNDLE - value: {{ $.Values.cacrtHostPath }} - {{- end }} - - name: SECRETS_KEYS - {{- $extraSecrets := list }} - {{- $extraKeyvaultSecrets := required (printf "extraKeyvaults.%s.secrets is missing" $index) .secrets }} - {{- if kindIs "map" $extraKeyvaultSecrets }} - {{- $extraSecrets = append $extraSecrets (values $extraKeyvaultSecrets | join ";") }} - {{- else if kindIs "slice" $extraKeyvaultSecrets }} - {{- $extraSecrets = append $extraSecrets ($extraKeyvaultSecrets | join ";") }} - {{- else }} - {{- $extraSecrets = append $extraSecrets $extraKeyvaultSecrets }} - {{- end }} - value: {{ $extraSecrets | join ";" }} - {{- if $.Values.keyvault.azureAuthorityServer }} - - name: AZURE_AUTHORITY_SERVER - value: {{ $.Values.keyvault.azureAuthorityServer }} - {{- end }} - - name: TIMEOUT - value: {{ $.Values.keyvault.timeout | quote }} - {{- if $.Values.keyvault.vaultResourceName}} - - name: VAULT_RESOURCE_NAME - value: {{ $.Values.keyvault.vaultResourceName }} - {{- end }} - volumeMounts: - - name: {{ $.Values.keyvault.volumeName }} - mountPath: {{ $.Values.keyvault.mountPath }} - {{- if $.Values.airgap }} - - name: sp-host - mountPath: {{ $.Values.spHostPath }} - readOnly: true - - name: cacrt-host - mountPath: {{ $.Values.cacrtHostPath }} - readOnly: true - {{- end }} - {{- end }} - {{- end }} - {{- end }} containers: - - name: mdm - command: - - /start_metricsextension.sh - env: - - name: MDM_INPUT - value: {{ required "missing mdm protocol" .Values.mdm.protocol }} - - name: MDM_ACCOUNT - value: {{ required "missing mdm account name" .Values.mdm.account }} - {{- if .Values.mdm.infraMetricsEnrichment }} - - name: CONFIG_OVERRIDES_FILE - value: /mdm_config_override/mdm-config-overrides.json - {{- end }} - image: "{{ required "acrUrl is missing" .Values.mdm.acrUrl }}/{{ required "MDM image name (mdm.imageName) is missing" .Values.mdm.imageName }}:{{ required "MDM image tag (mdm.imageTag) is missing" .Values.mdm.imageTag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - livenessProbe: - failureThreshold: 3 - initialDelaySeconds: 15 - periodSeconds: 20 - successThreshold: 1 - tcpSocket: - port: {{ required "missing mdm port" .Values.mdm.port }} - timeoutSeconds: 1 - readinessProbe: - exec: - command: - - bash - - -c - - 'if ! [[ "$(ls -A /tmp/geneva_mdm/)" ]] || ! [[ "$(nc -vz localhost {{ required "missing mdm port" .Values.mdm.port }} 2>&1)" =~ .*open$ ]]; then exit 1; fi' - failureThreshold: 3 - initialDelaySeconds: 5 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 1 - lifecycle: - postStart: - exec: - command: - - bash - - -c - - until [[ "$(ls -A /tmp/geneva_mdm/)" ]] && [[ "$(nc -vz localhost {{ required "missing mdm port" .Values.mdm.port }} 2>&1)" =~ .*open$ ]]; do sleep 1; done - {{- if or .Values.highThroughputPipeline.metrics.enabled .Values.mdm.appProcessName }} - {{- $processToMonitor := .Values.highThroughputPipeline.metrics.enabled | ternary "WDATP.Infra.EventsReader" .Values.mdm.appProcessName -}} - {{- /* - use preStop hook to add delay before SIGTERM is sent to mdm container, to enable 'flushing' of the application metrics from mdm-collector - */}} - preStop: - exec: - command: - - bash - - -c - - i=0; while [ $((i++)) -le 40 ] && pgrep -ifa {{ $processToMonitor | quote }} > /dev/null 2>&1; do sleep 1; done - {{- end }} - resources: -{{ .Values.mdm.resources | toYaml | indent 12 }} - volumeMounts: - - name: {{ .Values.keyvault.volumeName }} - mountPath: /tmp/geneva_mdm/ - readOnly: true - subPath: certs_keys - {{- if .Values.mdm.infraMetricsEnrichment }} - - name: mdm-config-overrides - mountPath: /mdm_config_override/ - readOnly: true - {{- end }} - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} @@ -288,9 +99,7 @@ spec: {{- if .Values.containerSecurityContext.enabled }} securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} {{- end }} - volumeMounts: - - name: {{ .Values.keyvault.volumeName }} - mountPath: {{ .Values.keyvault.mountPath }} + volumeMounts: - name: config-volume-{{ template "promitor-agent-scraper.name" . }} mountPath: /config/ {{- if and .Values.containerSecurityContext.enabled .Values.containerSecurityContext.readOnlyRootFilesystem }} @@ -329,9 +138,6 @@ spec: affinity: {{- tpl (toYaml .) $ | nindent 8 }} {{- end }} volumes: - - name: {{ .Values.keyvault.volumeName }} - emptyDir: - medium: Memory # we want the secrets to reside only in-memory - name: config-volume-{{ template "promitor-agent-scraper.name" . }} configMap: name: config-map-{{ template "promitor-agent-scraper.name" . }} diff --git a/promitor-agent-scraper/templates/podidentity.yaml b/promitor-agent-scraper/templates/podidentity.yaml deleted file mode 100644 index cc2252f..0000000 --- a/promitor-agent-scraper/templates/podidentity.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{- if .Values.podIdentity.enabled -}} -{{- $resourceIdFormat := "/subscriptions/%s/resourceGroups/%s/providers/Microsoft.ManagedIdentity/userAssignedIdentities/%s" -}} -{{- $subscriptionId := (required "subscriptionId is missing" .Values.podIdentity.subscriptionId) -}} -{{- $resourceGroup := (required "resourceGroup is missing" .Values.podIdentity.resourceGroupName) -}} -{{- $azureIdentityName := (required "azureIdentityName is missing" .Values.podIdentity.azureIdentityName) -}} -{{- $resourceId := printf $resourceIdFormat $subscriptionId $resourceGroup $azureIdentityName -}} - -apiVersion: "aadpodidentity.k8s.io/v1" -kind: AzureIdentityBinding -metadata: - name: {{ .Release.Name }} - labels: - app.kubernetes.io/name: {{ template "wdatp-service.name" . }} - helm.sh/chart: {{ template "wdatp-service.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -spec: - azureIdentity: {{ .Release.Name }} - selector: {{ .Release.Name }} ---- -apiVersion: "aadpodidentity.k8s.io/v1" -kind: AzureIdentity -metadata: - name: {{ .Release.Name }} - labels: - app.kubernetes.io/name: {{ template "wdatp-service.name" . }} - helm.sh/chart: {{ template "wdatp-service.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -spec: - type: 0 - resourceID: {{ $resourceId }} - clientID: {{ required "azureIdentityClientId is missing" .Values.podIdentity.azureIdentityClientId | quote }} -{{- end -}} \ No newline at end of file diff --git a/promitor-agent-scraper/values.yaml b/promitor-agent-scraper/values.yaml index 5c6ea62..be21718 100644 --- a/promitor-agent-scraper/values.yaml +++ b/promitor-agent-scraper/values.yaml @@ -6,32 +6,22 @@ replicaCount: 1 nameOverride: "" fullnameOverride: "" -imageAcrUrl: &imageAcrUrl wdatpacreus.azurecr.io - image: - acrUrl: *imageAcrUrl - repository: wdatpacreus.azurecr.io/mgmt.promitor.scraper + repository: containers.promitor.io/tomkerkhove/promitor-agent-scraper pullPolicy: Always pullSecrets: [] - tag: "20221020.3" + tag: azureAuthentication: appId: "" # [Deprecated] Prefer identity.id appKey: "" # [Deprecated] Prefer identity.key mode: "ServicePrincipal" identity: - id: c510fce5-b26b-4e58-b2ca-273820274ec6 - key: "" #P._8Q~hOPZukKSLpR87tFx~nXGLOd2c8P4QSwbup - appKeySecretFilePath: /vault-folder/secrets - appKeySecretName: wcd-vsts-stg-sp + id: "" + key: "" + appKeySecretFilePath: "" # The path to the secret file + appKeySecretFileName: "" # The file that contains the secret value binding: "" - -azureMetadata: - tenantId: 72f988bf-86f1-41af-91ab-2d7cd011db47 - subscriptionId: c5d1c552-a815-4fc8-b12d-ab444e3225b1 - cloud: Global - resourceGroupName: promitor - metricSinks: atlassianStatuspage: enabled: false @@ -40,6 +30,9 @@ metricSinks: systemMetricMapping: [] # - id: # promitorMetricName: + openTelemetryCollector: + enabled: false + collectorUri: "" prometheusScrapingEndpoint: enabled: true baseUriPath: /metrics @@ -56,13 +49,13 @@ metricSinks: metricRelabelings: [] relabelings: [] statsd: - enabled: true - host: "localhost" - port: 8125 - namespace: "WCDSTGM365DSRE" - account: "WCDStaging" - formattertype: "custom" - + enabled: false + host: "" + port: 8125 + metricPrefix: "" + namespace: "" # Custom field when using custom formatter type + account: "" # Custom field when using custom formatter type + formattertype: "default" # Can be set to default or custom prometheusRule: enabled: false namespace: "" @@ -80,27 +73,32 @@ prometheusRule: # description: | # Service {{ template "promitor-agent-scraper.name" . }} currently reports {{ "{{ $value }}" }} remaining calls before Azure Resource Manager throttles us. # summary: Azure Resource Manager may throttle us soon. +resourceDiscovery: + enabled: false + host: "" + port: 80 +telemetry: + defaultLogLevel: "Error" + applicationInsights: + enabled: false + key: "" + logLevel: "" + containerLogs: + enabled: true + logLevel: "" - ## Metric Declaration YAML +## Metric Declaration YAML +azureMetadata: + tenantId: "" + subscriptionId: "" + resourceGroupName: promitor + cloud: "Global" metricDefaults: aggregation: - interval: 00:01:00 - limit: 10 + interval: 00:05:00 scraping: - schedule: "*/3 * * * *" -metrics: - - name: azure_storage_account_capacity - description: "The average capacity used in the storage account" - resourceType: StorageAccount - azureMetricConfiguration: - metricName: UsedCapacity - aggregation: - type: Average - # resources: - # - accountName: abvc - resourceDiscoveryGroups: - - name: storage-accounts-landscape - description: "Goal nefesh" + schedule: "*/5 * * * *" +metrics: [] # Sample metric configuration below # - name: demo_queue_size # description: "Amount of active messages of the 'myqueue' queue (determined with ServiceBusQueue provider)" @@ -114,20 +112,13 @@ metrics: # - namespace: promitor-messaging # queueName: orders -resourceDiscovery: - enabled: true - host: "mgmt-promitor" - port: 8889 - -telemetry: - defaultLogLevel: "Error" - applicationInsights: +azureMonitor: + logging: enabled: false - key: "" - logLevel: "" - containerLogs: - enabled: true - logLevel: "" + logLevel: + integration: + history: + startingFromInHours: deployment: env: @@ -159,7 +150,7 @@ service: health: readiness: - enabled: false + enabled: true verifyDependencies: false delay: 5 interval: 5 @@ -168,7 +159,7 @@ health: failure: 3 success: 1 liveness: - enabled: false + enabled: true verifyDependencies: false delay: 5 interval: 30 @@ -185,13 +176,13 @@ annotations: {} priorityClassName: "" -resources: - limits: - cpu: 500m - memory: 1024Mi - requests: - cpu: 500m - memory: 1024Mi +resources: {} + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi ## Role-based access control ## https://kubernetes.io/docs/reference/access-authn-authz/rbac/ @@ -254,95 +245,3 @@ extraVolumes: [] # readOnly: true # volumeAttributes: # secretProviderClass: "promitor-secrets" - -environment: Staging - -# The image master_20220207-nc.1 just has `nc` over the image supplied by Geneva -# highThroughputPipeline: -# logs: -# mdsd: -# secrets: pfx-Geneva-STG::gcscert.pem:gcskey.pem -# gcs: -# account: WCDStaging -# environment: FirstPartyProd - -highThroughputPipeline: - imageName: "wdatp.infra.eventsreader" - imageTag: "20211218.1-d285ec723a95970419f42a32ea52a44e201c20e2" - # ! required by user ! - # genevaMdmNamespace: GenevaMdmNamespace - # ! required by user ! - # The following should be the name of the dll that you are monitoring - # AppName: myApp.dll - metrics: - enabled: false - resources: - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 200m - memory: 256Mi - circularBufferMB: 256 - appendMetricDisplayUnits: false - logs: - enabled: false - mdsd: - secrets: pfx-Geneva-STG::gcscert.pem:gcskey.pem - imageName: genevamdsd - imageTag: master_20220614.1-nc - # resources can be tuned. These values should handle 15k logs/s - resources: - limits: - cpu: 1500m - memory: 4Gi - requests: - cpu: 1500m - memory: 4Gi - backPressureBufferSizeInMB: 4096 - gcs: - account: WCDStaging - environment: FirstPartyProd - # secrets: common and set in /values folders - # ! required by user ! - # gcs: - # namespace: - # version: -keyvault: - enabled: true - vaultUrl: https://mgmt-runtime-stg-eus.vault.azure.net/ - acskeyvaultagent: - image: - name: wdatp.infra.keyvaultagent - tag: "20220410.2-375ce8621bbe0c5f9ece38e6dcd61436d9f92c5e" - mountPath: /vault-folder - volumeName: vault-folder - clusterServicePrincipalPath: /etc/kubernetes/azure.json - downloadCaCertificates: false - timeout: "60" - secrets: - - wcd-vsts-stg-sp - -### -# MDM -### - -mdm: - account: "WCDStaging" - secrets: pfx-Geneva-STG::mdm-cert.pem:mdm-key.pem - acrUrl: *imageAcrUrl - enabled: true - imageName: genevamdm - imageTag: master_20220614.1-nc - resources: - limits: - cpu: 200m - memory: 100Mi - requests: - cpu: 100m - memory: 100Mi - protocol: "ifx_tcp,statsd_udp" - port: 11013 - -podIdentity: - enabled: false From fd79cd6694932de00d42fd893dd8ddaca709296a Mon Sep 17 00:00:00 2001 From: arielhaim Date: Mon, 7 Nov 2022 09:38:29 +0200 Subject: [PATCH 3/3] fixed charts version --- bla.json | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 bla.json diff --git a/bla.json b/bla.json deleted file mode 100644 index a7e381e..0000000 --- a/bla.json +++ /dev/null @@ -1,15 +0,0 @@ -{ -"$schema":"https://ev2schema.azure.net/schemas/2020-01-01/scopeBindings.json", -"contentVersion":"1.0.0.0", -"scopeBindings":[ -{ -"scopeTagName":"SqlScriptsPath", -"bindings":[ -{ -"find":"__SQL_SCRIPTS_PATH__", -"replaceWith":"$(sqlScriptsPath)" -} -] -} -] -} \ No newline at end of file