From c59109270a7fcdb0372e7a0e837825d9b9c4ee65 Mon Sep 17 00:00:00 2001 From: Christoph Schug Date: Fri, 8 Mar 2024 14:14:41 +0100 Subject: [PATCH] fix: ensure Unix-style newlines Convert all DOS-style line breaks (carriage return followed by line feed) to Unix-style line breaks (line feed only). --- docker-compose/cadvisor/docker-compose.yaml | 34 ++++++------ .../nodeexporter/docker-compose.yaml | 18 +++---- .../prometheus/config/prometheus.yml | 54 +++++++++---------- vagrant/hyperv/ubuntu/docker/Vagrantfile | 40 +++++++------- .../ubuntu/microk8s-installed/Vagrantfile | 40 +++++++------- .../ubuntu/plain-with-cockpit/Vagrantfile | 44 +++++++-------- vagrant/hyperv/ubuntu/plain/Vagrantfile | 30 +++++------ 7 files changed, 130 insertions(+), 130 deletions(-) diff --git a/docker-compose/cadvisor/docker-compose.yaml b/docker-compose/cadvisor/docker-compose.yaml index 8534fc3..10d726c 100755 --- a/docker-compose/cadvisor/docker-compose.yaml +++ b/docker-compose/cadvisor/docker-compose.yaml @@ -1,17 +1,17 @@ ---- -services: - cadvisor: - image: gcr.io/cadvisor/cadvisor:v0.47.0 - 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 - privileged: true - restart: unless-stopped +--- +services: + cadvisor: + image: gcr.io/cadvisor/cadvisor:v0.47.0 + 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 + privileged: true + restart: unless-stopped diff --git a/docker-compose/nodeexporter/docker-compose.yaml b/docker-compose/nodeexporter/docker-compose.yaml index eaf5b5a..9ac3902 100755 --- a/docker-compose/nodeexporter/docker-compose.yaml +++ b/docker-compose/nodeexporter/docker-compose.yaml @@ -1,10 +1,10 @@ ---- -services: - node_exporter: - image: quay.io/prometheus/node-exporter:v1.5.0 - container_name: node_exporter - command: "--path.rootfs=/host" - pid: host - restart: unless-stopped - volumes: +--- +services: + node_exporter: + image: quay.io/prometheus/node-exporter:v1.5.0 + container_name: node_exporter + command: "--path.rootfs=/host" + pid: host + restart: unless-stopped + volumes: - /:/host:ro,rslave diff --git a/docker-compose/prometheus/config/prometheus.yml b/docker-compose/prometheus/config/prometheus.yml index 71a19b5..8f41942 100755 --- a/docker-compose/prometheus/config/prometheus.yml +++ b/docker-compose/prometheus/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/vagrant/hyperv/ubuntu/docker/Vagrantfile b/vagrant/hyperv/ubuntu/docker/Vagrantfile index 276b0ee..7530a3b 100755 --- a/vagrant/hyperv/ubuntu/docker/Vagrantfile +++ b/vagrant/hyperv/ubuntu/docker/Vagrantfile @@ -1,20 +1,20 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - config.vm.box = "generic/ubuntu2004" - config.vm.network "public_network" - config.vm.synced_folder ".", "/vagrant_data", disabled: true - config.vm.provider "hyperv" - config.vm.provider "hyperv" do |h| - h.enable_virtualization_extensions = false - h.linked_clone = true - h.memory = 2048 - h.vmname = "ubuntu_docker_1" - end - - config.vm.provision "ansible" do |a| - a.verbose = "v" - a.playbook = "playbook.yaml" - end -end +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + config.vm.box = "generic/ubuntu2004" + config.vm.network "public_network" + config.vm.synced_folder ".", "/vagrant_data", disabled: true + config.vm.provider "hyperv" + config.vm.provider "hyperv" do |h| + h.enable_virtualization_extensions = false + h.linked_clone = true + h.memory = 2048 + h.vmname = "ubuntu_docker_1" + end + + config.vm.provision "ansible" do |a| + a.verbose = "v" + a.playbook = "playbook.yaml" + end +end diff --git a/vagrant/hyperv/ubuntu/microk8s-installed/Vagrantfile b/vagrant/hyperv/ubuntu/microk8s-installed/Vagrantfile index 166cabb..aa22bd5 100755 --- a/vagrant/hyperv/ubuntu/microk8s-installed/Vagrantfile +++ b/vagrant/hyperv/ubuntu/microk8s-installed/Vagrantfile @@ -1,20 +1,20 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - config.vm.box = "generic/ubuntu2004" - config.vm.network "public_network" - config.vm.synced_folder ".", "/vagrant_data", disabled: true - config.vm.provider "hyperv" - config.vm.provider "hyperv" do |h| - h.enable_virtualization_extensions = false - h.linked_clone = true - h.memory = 2048 - h.vmname = "ubuntu_plain_1" - end - - config.vm.provision "ansible" do |a| - a.verbose = "v" - a.playbook = "playbook.yaml" - end -end +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + config.vm.box = "generic/ubuntu2004" + config.vm.network "public_network" + config.vm.synced_folder ".", "/vagrant_data", disabled: true + config.vm.provider "hyperv" + config.vm.provider "hyperv" do |h| + h.enable_virtualization_extensions = false + h.linked_clone = true + h.memory = 2048 + h.vmname = "ubuntu_plain_1" + end + + config.vm.provision "ansible" do |a| + a.verbose = "v" + a.playbook = "playbook.yaml" + end +end diff --git a/vagrant/hyperv/ubuntu/plain-with-cockpit/Vagrantfile b/vagrant/hyperv/ubuntu/plain-with-cockpit/Vagrantfile index 9a3e191..75e431e 100755 --- a/vagrant/hyperv/ubuntu/plain-with-cockpit/Vagrantfile +++ b/vagrant/hyperv/ubuntu/plain-with-cockpit/Vagrantfile @@ -1,22 +1,22 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - config.vm.box = "generic/ubuntu2004" - config.vm.network "public_network", bridge: "BRIDGE" - config.vm.synced_folder ".", "/vagrant_data", disabled: true - config.vm.provider "hyperv" - config.vm.hostname = "ubuntu_plan-with-cockpit-1" - - config.vm.provider "hyperv" do |h| - h.enable_virtualization_extensions = false - h.linked_clone = true - h.memory = 2048 - h.vmname = "ubuntu_plan-with-cockpit-1" - end - - config.vm.provision "ansible" do |a| - a.verbose = "v" - a.playbook = "playbook.yaml" - end -end +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + config.vm.box = "generic/ubuntu2004" + config.vm.network "public_network", bridge: "BRIDGE" + config.vm.synced_folder ".", "/vagrant_data", disabled: true + config.vm.provider "hyperv" + config.vm.hostname = "ubuntu_plan-with-cockpit-1" + + config.vm.provider "hyperv" do |h| + h.enable_virtualization_extensions = false + h.linked_clone = true + h.memory = 2048 + h.vmname = "ubuntu_plan-with-cockpit-1" + end + + config.vm.provision "ansible" do |a| + a.verbose = "v" + a.playbook = "playbook.yaml" + end +end diff --git a/vagrant/hyperv/ubuntu/plain/Vagrantfile b/vagrant/hyperv/ubuntu/plain/Vagrantfile index c1c5863..3911f7b 100755 --- a/vagrant/hyperv/ubuntu/plain/Vagrantfile +++ b/vagrant/hyperv/ubuntu/plain/Vagrantfile @@ -1,15 +1,15 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - config.vm.box = "generic/ubuntu2004" - config.vm.network "public_network" - config.vm.synced_folder ".", "/vagrant_data", disabled: true - config.vm.provider "hyperv" - config.vm.provider "hyperv" do |h| - h.enable_virtualization_extensions = false - h.linked_clone = true - h.memory = 2048 - h.vmname = "ubuntu_plain_1" - end -end +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + config.vm.box = "generic/ubuntu2004" + config.vm.network "public_network" + config.vm.synced_folder ".", "/vagrant_data", disabled: true + config.vm.provider "hyperv" + config.vm.provider "hyperv" do |h| + h.enable_virtualization_extensions = false + h.linked_clone = true + h.memory = 2048 + h.vmname = "ubuntu_plain_1" + end +end