From 5d84281a3d248f3c2adb44976231f83fe25ff5d5 Mon Sep 17 00:00:00 2001 From: xcad2k <28359525+xcad2k@users.noreply.github.com> Date: Wed, 22 Sep 2021 16:20:49 +0200 Subject: [PATCH] quickupdate --- docker-compose/prometheus-grafana/README.md | 0 .../prometheus-grafana/config/prometheus.yml | 54 ++++++++--------- .../prometheus-grafana/docker-compose.yml | 58 +++++++++---------- .../exporters/cadvisor/docker-compose.yml | 32 +++++----- .../node_exporter/docker-compose.yml | 24 ++++---- vagrant/hyperv/ubuntu/docker/Vagrantfile | 0 .../ubuntu/microk8s-installed/Vagrantfile | 0 .../ubuntu/plain-with-cockpit/Vagrantfile | 0 .../ubuntu/plain-with-cockpit/playbook.yaml | 0 vagrant/hyperv/ubuntu/plain/Vagrantfile | 0 10 files changed, 84 insertions(+), 84 deletions(-) mode change 100644 => 100755 docker-compose/prometheus-grafana/README.md mode change 100644 => 100755 docker-compose/prometheus-grafana/config/prometheus.yml mode change 100644 => 100755 docker-compose/prometheus-grafana/docker-compose.yml mode change 100644 => 100755 docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml mode change 100644 => 100755 docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml mode change 100644 => 100755 vagrant/hyperv/ubuntu/docker/Vagrantfile mode change 100644 => 100755 vagrant/hyperv/ubuntu/microk8s-installed/Vagrantfile mode change 100644 => 100755 vagrant/hyperv/ubuntu/plain-with-cockpit/Vagrantfile mode change 100644 => 100755 vagrant/hyperv/ubuntu/plain-with-cockpit/playbook.yaml mode change 100644 => 100755 vagrant/hyperv/ubuntu/plain/Vagrantfile diff --git a/docker-compose/prometheus-grafana/README.md b/docker-compose/prometheus-grafana/README.md old mode 100644 new mode 100755 diff --git a/docker-compose/prometheus-grafana/config/prometheus.yml b/docker-compose/prometheus-grafana/config/prometheus.yml old mode 100644 new mode 100755 index a92bc91..11191d3 --- a/docker-compose/prometheus-grafana/config/prometheus.yml +++ b/docker-compose/prometheus-grafana/config/prometheus.yml @@ -1,27 +1,27 @@ -global: - scrape_interval: 15s # By default, scrape targets every 15 seconds. - - # Attach these labels to any time series or alerts when communicating with - # external systems (federation, remote storage, Alertmanager). - # external_labels: - # monitor: 'codelab-monitor' - -# A scrape configuration containing exactly one endpoint to scrape: -# Here it's Prometheus itself. -scrape_configs: - # The job name is added as a label `job=` to any timeseries scraped from this config. - - job_name: 'prometheus' - # Override the global default and scrape targets from this job every 5 seconds. - scrape_interval: 5s - static_configs: - - targets: ['localhost:9090'] - - # Example job for node_exporter - # - job_name: 'node_exporter' - # static_configs: - # - targets: ['node_exporter:9100'] - - # Example job for cadvisor - # - job_name: 'cadvisor' - # static_configs: - # - targets: ['cadvisor:8080'] +global: + scrape_interval: 15s # By default, scrape targets every 15 seconds. + + # Attach these labels to any time series or alerts when communicating with + # external systems (federation, remote storage, Alertmanager). + # external_labels: + # monitor: 'codelab-monitor' + +# A scrape configuration containing exactly one endpoint to scrape: +# Here it's Prometheus itself. +scrape_configs: + # The job name is added as a label `job=` to any timeseries scraped from this config. + - job_name: 'prometheus' + # Override the global default and scrape targets from this job every 5 seconds. + scrape_interval: 5s + static_configs: + - targets: ['localhost:9090'] + + # Example job for node_exporter + # - job_name: 'node_exporter' + # static_configs: + # - targets: ['node_exporter:9100'] + + # Example job for cadvisor + # - job_name: 'cadvisor' + # static_configs: + # - targets: ['cadvisor:8080'] diff --git a/docker-compose/prometheus-grafana/docker-compose.yml b/docker-compose/prometheus-grafana/docker-compose.yml old mode 100644 new mode 100755 index b46c1e5..734ff04 --- a/docker-compose/prometheus-grafana/docker-compose.yml +++ b/docker-compose/prometheus-grafana/docker-compose.yml @@ -1,30 +1,30 @@ ---- -version: '3' - -volumes: - prometheus-data: - driver: local - grafana-data: - driver: local - -services: - prometheus: - image: prom/prometheus:latest - container_name: prometheus - ports: - - "9090:9090" - volumes: - - /etc/prometheus:/config - - prometheus-data:/prometheus - restart: unless-stopped - command: - - "--config.file=/config/prometheus.yml" - - grafana: - image: grafana/grafana:latest - container_name: grafana - ports: - - "3000:3000" - volumes: - - grafana-data:/var/lib/grafana +--- +version: '3' + +volumes: + prometheus-data: + driver: local + grafana-data: + driver: local + +services: + prometheus: + image: prom/prometheus:latest + container_name: prometheus + ports: + - "9090:9090" + volumes: + - /etc/prometheus:/config + - prometheus-data:/prometheus + restart: unless-stopped + command: + - "--config.file=/config/prometheus.yml" + + grafana: + image: grafana/grafana:latest + container_name: grafana + ports: + - "3000:3000" + volumes: + - grafana-data:/var/lib/grafana restart: unless-stopped \ No newline at end of file diff --git a/docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml b/docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml old mode 100644 new mode 100755 index 85ed105..6f015e2 --- a/docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml +++ b/docker-compose/prometheus-grafana/exporters/cadvisor/docker-compose.yml @@ -1,17 +1,17 @@ ---- -version: '3' - -services: - cadvisor: - image: google/cadvisor:latest - container_name: cadvisor - # ports: - # - "8080:8080" - volumes: - - /:/rootfs:ro - - /var/run:/var/run:ro - - /sys:/sys:ro - - /var/lib/docker/:/var/lib/docker:ro - - /dev/disk/:/dev/disk:ro - devices: +--- +version: '3' + +services: + cadvisor: + image: google/cadvisor:latest + container_name: cadvisor + # ports: + # - "8080:8080" + volumes: + - /:/rootfs:ro + - /var/run:/var/run:ro + - /sys:/sys:ro + - /var/lib/docker/:/var/lib/docker:ro + - /dev/disk/:/dev/disk:ro + devices: - /dev/kmsg \ No newline at end of file diff --git a/docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml b/docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml old mode 100644 new mode 100755 index e6f5e6d..07ff1ef --- a/docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml +++ b/docker-compose/prometheus-grafana/exporters/node_exporter/docker-compose.yml @@ -1,13 +1,13 @@ ---- -version: '3.8' - -services: - node_exporter: - image: quay.io/prometheus/node-exporter:latest - container_name: node_exporter - command: - - '--path.rootfs=/host' - pid: host - restart: unless-stopped - volumes: +--- +version: '3.8' + +services: + node_exporter: + image: quay.io/prometheus/node-exporter:latest + container_name: node_exporter + command: + - '--path.rootfs=/host' + pid: host + restart: unless-stopped + volumes: - '/:/host:ro,rslave' \ No newline at end of file diff --git a/vagrant/hyperv/ubuntu/docker/Vagrantfile b/vagrant/hyperv/ubuntu/docker/Vagrantfile old mode 100644 new mode 100755 diff --git a/vagrant/hyperv/ubuntu/microk8s-installed/Vagrantfile b/vagrant/hyperv/ubuntu/microk8s-installed/Vagrantfile old mode 100644 new mode 100755 diff --git a/vagrant/hyperv/ubuntu/plain-with-cockpit/Vagrantfile b/vagrant/hyperv/ubuntu/plain-with-cockpit/Vagrantfile old mode 100644 new mode 100755 diff --git a/vagrant/hyperv/ubuntu/plain-with-cockpit/playbook.yaml b/vagrant/hyperv/ubuntu/plain-with-cockpit/playbook.yaml old mode 100644 new mode 100755 diff --git a/vagrant/hyperv/ubuntu/plain/Vagrantfile b/vagrant/hyperv/ubuntu/plain/Vagrantfile old mode 100644 new mode 100755