diff options
| -rw-r--r-- | inventory/group_vars/elevate-festival/vars.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ele-mon.yml | 50 |
2 files changed, 6 insertions, 48 deletions
diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index 9391f80c..c1510590 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -265,7 +265,7 @@ network_zones: offsets: ## citycom uses offset 1,2 and 3 ele-router-leslie: 5 #4 # x.x.x.x+4 - ele-thetys: 6 #5 # x.x.x.x+5 + ele-thetys: 7 #5 # x.x.x.x+5 cc_hmtsaal: description: "citycom upstream @ Heimatsaal (Fiber)" @@ -279,7 +279,7 @@ network_zones: offsets: ## citycom uses offset 1,2 and 3 ele-router-hmtsaal: 4 # x.x.x.x+4 - ele-telesto: 5 # x.x.x.x+5 + ele-telesto: 6 #5 # x.x.x.x+5 funkfeuer: description: "funkfeuer access, subnet will be announced by olsr using HNA" diff --git a/inventory/host_vars/ele-mon.yml b/inventory/host_vars/ele-mon.yml index e218ef7b..78aaad29 100644 --- a/inventory/host_vars/ele-mon.yml +++ b/inventory/host_vars/ele-mon.yml @@ -1,20 +1,16 @@ --- install: vm: - memory: 6G + memory: 8G numcpus: 4 autostart: yes disks: primary: /dev/sda scsi: sda: - type: zfs - name: root - size: 10g - sdb: - type: zfs - backend: storage - name: data + type: lvm + vg: "{{ vm_host }}" + lv: "vm_{{ inventory_hostname }}_root" size: 50g interfaces: - bridge: br-lan @@ -68,31 +64,12 @@ prometheus_server_web_external_url: "http://{{ network.primary.address | ipaddr( prometheus_exporters_extra: - blackbox - nut - - mikrotik prometheus_exporter_blackbox_modules_extra: icmp: prober: icmp -prometheus_exporter_mikrotik_devices: - - name: ele-br-nextlib0 - address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets['ele-br-nextlib0']) | ipaddr('address') }}" - user: prometheus - password: "{{ vault_prometheus_exporter_mikrotik_api_password }}" - - name: ele-br-tub0 - address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets['ele-br-tub0']) | ipaddr('address') }}" - user: prometheus - password: "{{ vault_prometheus_exporter_mikrotik_api_password }}" - - name: ele-br-nextlib1 - address: "{{ network_zones.funkfeuer.prefix | ipaddr(network_zones.funkfeuer.offsets['ele-br-nextlib1']) | ipaddr('address') }}" - user: prometheus - password: "{{ vault_prometheus_exporter_mikrotik_api_password }}" - - name: ele-br-tub1 - address: "{{ network_zones.funkfeuer.prefix | ipaddr(network_zones.funkfeuer.offsets['ele-br-tub1']) | ipaddr('address') }}" - user: prometheus - password: "{{ vault_prometheus_exporter_mikrotik_api_password }}" - prometheus_alertmanager_web_external_url: "http://{{ network.primary.address | ipaddr('address') }}/alertmanager/" prometheus_alertmanager_smtp: smarthost: "mailrelay.chaos-at-home.org:587" @@ -117,22 +94,3 @@ prometheus_alertmanager_receivers: grafana_secret_key: "{{ vault_grafana_secret_key }}" - - -prometheus_server_jobs_extra: | - - job_name: 'mikrotik' - metrics_path: /proxy - params: - module: - - mikrotik - scheme: https - tls_config: - ca_file: /etc/ssl/prometheus/ca-crt.pem - cert_file: /etc/ssl/prometheus/server/scrape-crt.pem - key_file: /etc/ssl/prometheus/server/scrape-key.pem - static_configs: - - targets: - - dummy - relabel_configs: - - target_label: __address__ - replacement: 192.168.18.220:9999 |