diff options
| -rw-r--r-- | inventory/group_vars/elevate-festival/vars.yml | 3 | ||||
| -rw-r--r-- | inventory/host_vars/ele-hpws-maxi.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ele-minidan.yml | 6 | ||||
| -rw-r--r-- | inventory/host_vars/ele-mon.yml | 47 | ||||
| -rw-r--r-- | inventory/host_vars/ele-tsdatacop.yml | 4 |
5 files changed, 48 insertions, 16 deletions
diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index a0ea92c5..1e2f9eb1 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -244,7 +244,8 @@ network_zones: - 10.12.0.10 offsets: ele-tub: 14 - ele-br-tub1: 13 + ele-br-tub1: 13 # --> ele-br-nextlib1 + ele-br-nextlib1: 12 # --> ele-br-tub1 murat_transfer: description: "transfer network for upstream via mur.at" diff --git a/inventory/host_vars/ele-hpws-maxi.yml b/inventory/host_vars/ele-hpws-maxi.yml index 3098749b..0754c7c4 100644 --- a/inventory/host_vars/ele-hpws-maxi.yml +++ b/inventory/host_vars/ele-hpws-maxi.yml @@ -57,6 +57,10 @@ apt_repo_components: base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" +ssh_users_root: + - equinox + - datacop + admin_users_host: - equinox diff --git a/inventory/host_vars/ele-minidan.yml b/inventory/host_vars/ele-minidan.yml index df7ab77c..73415369 100644 --- a/inventory/host_vars/ele-minidan.yml +++ b/inventory/host_vars/ele-minidan.yml @@ -66,3 +66,9 @@ ws_base_lightdm_defaults: ws_base_extra_packages: - mpv + +ws_base_xrandr_setup_script: | + #!/bin/bash + + xrandr --output HDMI-1 --mode 1920x1080 --rate 50 + exit 0 diff --git a/inventory/host_vars/ele-mon.yml b/inventory/host_vars/ele-mon.yml index 8d03c52d..9a734b3a 100644 --- a/inventory/host_vars/ele-mon.yml +++ b/inventory/host_vars/ele-mon.yml @@ -79,10 +79,10 @@ prometheus_exporter_mikrotik_devices: 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-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 }}" prometheus_alertmanager_web_route_prefix: /alertmanager/ @@ -119,7 +119,7 @@ prometheus_server_jobs_extra: | - 192.168.42.170:9100 ## ele-ap-nextlib0 - 192.168.42.171:9100 ## ele-ap-nextlib1 - 192.168.42.172:9100 ## ele-ap-nextlib2 - - 192.168.42.173:9100 ## ele-ap-nextlib3 + #- 192.168.42.173:9100 ## ele-ap-nextlib3 - 192.168.42.174:9100 ## ele-ap-nextlib4 - 192.168.42.175:9100 ## ele-ap-nextlib5 - 192.168.42.176:9100 ## ele-ap-nextlib6 @@ -147,13 +147,30 @@ prometheus_server_jobs_extra: | - nextlib2@192.168.42.212 - nextlib3@192.168.42.213 relabel_configs: - - source_labels: [__address__] - regex: .*@(.*) - target_label: __param_server - - source_labels: [__address__] - regex: (.*)@.* - target_label: __param_ups - - source_labels: [__param_ups] - target_label: instance - - target_label: __address__ - replacement: 192.168.18.220:9999 + - source_labels: [__address__] + regex: .*@(.*) + target_label: __param_server + - source_labels: [__address__] + regex: (.*)@.* + target_label: __param_ups + - source_labels: [__param_ups] + target_label: instance + - target_label: __address__ + replacement: 192.168.18.220:9999 + + - 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 diff --git a/inventory/host_vars/ele-tsdatacop.yml b/inventory/host_vars/ele-tsdatacop.yml index 02610a63..bb032b64 100644 --- a/inventory/host_vars/ele-tsdatacop.yml +++ b/inventory/host_vars/ele-tsdatacop.yml @@ -57,6 +57,10 @@ apt_repo_components: base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" +ssh_users_root: + - equinox + - datacop + admin_users_host: - equinox |