Merge pull request 'merge to master' (#1) from dev into master

Reviewed-on: jhummel/monitoring-grafana-influxdb-telegraf-prometheus#1
2022-05-07 00:29:11 +02:00
parent ffa5532415 16b0bcfbfb
commit bddae3bcda
3 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,7 @@ packages.mk
 **/.terraform.tfstate.lock.info

 # Folders and files
+*.tar
 certificates
 terraform
 configuration.cluster
--- a/all-monitor.tar
+++ b/all-monitor.tar
--- a/prometheus/prometheus.yml
+++ b/prometheus/prometheus.yml
@@ -1,4 +1,4 @@
-# my global config
+# global config
 global:
  scrape_interval:     15s # By default, scrape targets every 15 seconds.
  evaluation_interval: 15s # By default, scrape targets every 15 seconds.