From d24d7b45a3707568a30f8f619747a95f4dea9556 Mon Sep 17 00:00:00 2001
From: cventastic <sven@sven-holter.de>
Date: Wed, 16 Mar 2022 14:33:25 +0100
Subject: [PATCH] remove prometheus.yml and remove nodeexporter/cadvisor from
 autodiscover, because they too should be autodiscovered.

---
 prometheus/prometheus-autodiscover.yml |  9 -----
 prometheus/prometheus.yml              | 55 --------------------------
 2 files changed, 64 deletions(-)
 delete mode 100644 prometheus/prometheus.yml

diff --git a/prometheus/prometheus-autodiscover.yml b/prometheus/prometheus-autodiscover.yml
index 8b8e828a..a4d41826 100644
--- a/prometheus/prometheus-autodiscover.yml
+++ b/prometheus/prometheus-autodiscover.yml
@@ -13,15 +13,6 @@ rule_files:
 
 # A scrape configuration containing exactly one endpoint to scrape.
 scrape_configs:
-  - job_name: 'nodeexporter'
-    scrape_interval: 5s
-    static_configs:
-      - targets: ['nodeexporter:9100']
-
-  - job_name: 'cadvisor'
-    scrape_interval: 5s
-    static_configs:
-      - targets: ['cadvisor:8080']
 
   - job_name: 'prometheus'
     scrape_interval: 10s
diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml
deleted file mode 100644
index 9d1b7d4f..00000000
--- a/prometheus/prometheus.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-global:
-  scrape_interval:     15s
-  evaluation_interval: 15s
-
-  # Attach these labels to any time series or alerts when communicating with
-  # external systems (federation, remote storage, Alertmanager).
-  external_labels:
-      monitor: 'docker-host-alpha'
-
-# Load and evaluate rules in this file every 'evaluation_interval' seconds.
-rule_files:
-  - "alert.rules"
-
-# A scrape configuration containing exactly one endpoint to scrape.
-scrape_configs:
-  - job_name: 'nodeexporter'
-    scrape_interval: 5s
-    static_configs:
-      - targets: ['nodeexporter:9100']
-
-  - job_name: 'cadvisor'
-    scrape_interval: 5s
-    static_configs:
-      - targets: ['cadvisor:8080']
-
-  - job_name: 'prometheus'
-    scrape_interval: 10s
-    static_configs:
-      - targets: ['localhost:9090']
-
-  - job_name: 'pushgateway'
-    scrape_interval: 10s
-    honor_labels: true
-    static_configs:
-      - targets: ['pushgateway:9091']
-
-  - job_name: 'pocket-fr-1'
-    scrape_interval: 10s
-    honor_labels: true
-    static_configs:
-      - targets: ['pocket-fr-1:8083']
-      - targets: ['pocket-fr-1:26660']
-
-  - job_name: 'pocket-fr-2'
-    scrape_interval: 10s
-    honor_labels: true
-    static_configs:
-      - targets: ['pocket-fr-2:8083']
-      - targets: ['pocket-fr-2:26660']
-
-  - job_name: 'traefik'
-    scrape_interval: 10s
-    honor_labels: true
-    static_configs:
-      - targets: ['traefik:8082']
\ No newline at end of file