Merge pull request #171 from cschug/fix_newlines

fix: ensure Unix-style newlines
This commit is contained in:
Christoph Schug 2024-03-08 14:18:56 +01:00 committed by GitHub
commit 0d8d646a61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 130 additions and 130 deletions

View File

@ -1,17 +1,17 @@
--- ---
services: services:
cadvisor: cadvisor:
image: gcr.io/cadvisor/cadvisor:v0.47.0 image: gcr.io/cadvisor/cadvisor:v0.47.0
container_name: cadvisor container_name: cadvisor
ports: ports:
- 8080:8080 - 8080:8080
volumes: volumes:
- /:/rootfs:ro - /:/rootfs:ro
- /var/run:/var/run:ro - /var/run:/var/run:ro
- /sys:/sys:ro - /sys:/sys:ro
- /var/lib/docker/:/var/lib/docker:ro - /var/lib/docker/:/var/lib/docker:ro
- /dev/disk/:/dev/disk:ro - /dev/disk/:/dev/disk:ro
devices: devices:
- /dev/kmsg - /dev/kmsg
privileged: true privileged: true
restart: unless-stopped restart: unless-stopped

View File

@ -1,10 +1,10 @@
--- ---
services: services:
node_exporter: node_exporter:
image: quay.io/prometheus/node-exporter:v1.5.0 image: quay.io/prometheus/node-exporter:v1.5.0
container_name: node_exporter container_name: node_exporter
command: "--path.rootfs=/host" command: "--path.rootfs=/host"
pid: host pid: host
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- /:/host:ro,rslave - /:/host:ro,rslave

View File

@ -1,27 +1,27 @@
global: global:
scrape_interval: 15s # By default, scrape targets every 15 seconds. scrape_interval: 15s # By default, scrape targets every 15 seconds.
# Attach these labels to any time series or alerts when communicating with # Attach these labels to any time series or alerts when communicating with
# external systems (federation, remote storage, Alertmanager). # external systems (federation, remote storage, Alertmanager).
# external_labels: # external_labels:
# monitor: 'codelab-monitor' # monitor: 'codelab-monitor'
# A scrape configuration containing exactly one endpoint to scrape: # A scrape configuration containing exactly one endpoint to scrape:
# Here it's Prometheus itself. # Here it's Prometheus itself.
scrape_configs: scrape_configs:
# The job name is added as a label `job=<job_name>` to any timeseries scraped from this config. # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
- job_name: 'prometheus' - job_name: 'prometheus'
# Override the global default and scrape targets from this job every 5 seconds. # Override the global default and scrape targets from this job every 5 seconds.
scrape_interval: 5s scrape_interval: 5s
static_configs: static_configs:
- targets: ['localhost:9090'] - targets: ['localhost:9090']
# Example job for node_exporter # Example job for node_exporter
# - job_name: 'node_exporter' # - job_name: 'node_exporter'
# static_configs: # static_configs:
# - targets: ['node_exporter:9100'] # - targets: ['node_exporter:9100']
# Example job for cadvisor # Example job for cadvisor
# - job_name: 'cadvisor' # - job_name: 'cadvisor'
# static_configs: # static_configs:
# - targets: ['cadvisor:8080'] # - targets: ['cadvisor:8080']

View File

@ -1,20 +1,20 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "generic/ubuntu2004" config.vm.box = "generic/ubuntu2004"
config.vm.network "public_network" config.vm.network "public_network"
config.vm.synced_folder ".", "/vagrant_data", disabled: true config.vm.synced_folder ".", "/vagrant_data", disabled: true
config.vm.provider "hyperv" config.vm.provider "hyperv"
config.vm.provider "hyperv" do |h| config.vm.provider "hyperv" do |h|
h.enable_virtualization_extensions = false h.enable_virtualization_extensions = false
h.linked_clone = true h.linked_clone = true
h.memory = 2048 h.memory = 2048
h.vmname = "ubuntu_docker_1" h.vmname = "ubuntu_docker_1"
end end
config.vm.provision "ansible" do |a| config.vm.provision "ansible" do |a|
a.verbose = "v" a.verbose = "v"
a.playbook = "playbook.yaml" a.playbook = "playbook.yaml"
end end
end end

View File

@ -1,20 +1,20 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "generic/ubuntu2004" config.vm.box = "generic/ubuntu2004"
config.vm.network "public_network" config.vm.network "public_network"
config.vm.synced_folder ".", "/vagrant_data", disabled: true config.vm.synced_folder ".", "/vagrant_data", disabled: true
config.vm.provider "hyperv" config.vm.provider "hyperv"
config.vm.provider "hyperv" do |h| config.vm.provider "hyperv" do |h|
h.enable_virtualization_extensions = false h.enable_virtualization_extensions = false
h.linked_clone = true h.linked_clone = true
h.memory = 2048 h.memory = 2048
h.vmname = "ubuntu_plain_1" h.vmname = "ubuntu_plain_1"
end end
config.vm.provision "ansible" do |a| config.vm.provision "ansible" do |a|
a.verbose = "v" a.verbose = "v"
a.playbook = "playbook.yaml" a.playbook = "playbook.yaml"
end end
end end

View File

@ -1,22 +1,22 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "generic/ubuntu2004" config.vm.box = "generic/ubuntu2004"
config.vm.network "public_network", bridge: "BRIDGE" config.vm.network "public_network", bridge: "BRIDGE"
config.vm.synced_folder ".", "/vagrant_data", disabled: true config.vm.synced_folder ".", "/vagrant_data", disabled: true
config.vm.provider "hyperv" config.vm.provider "hyperv"
config.vm.hostname = "ubuntu_plan-with-cockpit-1" config.vm.hostname = "ubuntu_plan-with-cockpit-1"
config.vm.provider "hyperv" do |h| config.vm.provider "hyperv" do |h|
h.enable_virtualization_extensions = false h.enable_virtualization_extensions = false
h.linked_clone = true h.linked_clone = true
h.memory = 2048 h.memory = 2048
h.vmname = "ubuntu_plan-with-cockpit-1" h.vmname = "ubuntu_plan-with-cockpit-1"
end end
config.vm.provision "ansible" do |a| config.vm.provision "ansible" do |a|
a.verbose = "v" a.verbose = "v"
a.playbook = "playbook.yaml" a.playbook = "playbook.yaml"
end end
end end

View File

@ -1,15 +1,15 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "generic/ubuntu2004" config.vm.box = "generic/ubuntu2004"
config.vm.network "public_network" config.vm.network "public_network"
config.vm.synced_folder ".", "/vagrant_data", disabled: true config.vm.synced_folder ".", "/vagrant_data", disabled: true
config.vm.provider "hyperv" config.vm.provider "hyperv"
config.vm.provider "hyperv" do |h| config.vm.provider "hyperv" do |h|
h.enable_virtualization_extensions = false h.enable_virtualization_extensions = false
h.linked_clone = true h.linked_clone = true
h.memory = 2048 h.memory = 2048
h.vmname = "ubuntu_plain_1" h.vmname = "ubuntu_plain_1"
end end
end end