Skip to content

Commit

Permalink
fix: ensure Unix-style newlines
Browse files Browse the repository at this point in the history
Convert all DOS-style line breaks (carriage return followed by line
feed) to Unix-style line breaks (line feed only).
  • Loading branch information
cschug committed Mar 8, 2024
1 parent e7077ef commit c591092
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 130 deletions.
34 changes: 17 additions & 17 deletions docker-compose/cadvisor/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -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
18 changes: 9 additions & 9 deletions docker-compose/nodeexporter/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -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
54 changes: 27 additions & 27 deletions docker-compose/prometheus/config/prometheus.yml
Original file line number Diff line number Diff line change
@@ -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=<job_name>` 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=<job_name>` 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']
40 changes: 20 additions & 20 deletions vagrant/hyperv/ubuntu/docker/Vagrantfile
Original file line number Diff line number Diff line change
@@ -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
40 changes: 20 additions & 20 deletions vagrant/hyperv/ubuntu/microk8s-installed/Vagrantfile
Original file line number Diff line number Diff line change
@@ -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
44 changes: 22 additions & 22 deletions vagrant/hyperv/ubuntu/plain-with-cockpit/Vagrantfile
Original file line number Diff line number Diff line change
@@ -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
30 changes: 15 additions & 15 deletions vagrant/hyperv/ubuntu/plain/Vagrantfile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c591092

Please sign in to comment.