Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 78bfdf70fa | |||
| f6f6cc4804 | |||
| 52d3d8ecd9 |
15 changed files with 32 additions and 17 deletions
|
|
@ -11,7 +11,7 @@ jobs:
|
|||
build:
|
||||
runs-on: docker
|
||||
container:
|
||||
image: docker.io/library/python:3.14-trixie
|
||||
image: docker.io/library/python:3.15-trixie
|
||||
steps:
|
||||
- name: Pipeline info
|
||||
run: |
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
# work in our environmnet.
|
||||
# Rather manually setup python (pip) before instead.
|
||||
- name: Run ansible-lint
|
||||
uses: https://github.com/ansible/ansible-lint@v26.6.0
|
||||
uses: https://github.com/ansible/ansible-lint@v26.10.1
|
||||
with:
|
||||
setup_python: "false"
|
||||
requirements_file: "requirements.yml"
|
||||
|
|
|
|||
|
|
@ -50,7 +50,10 @@ alloy_config_default: |
|
|||
}
|
||||
|
||||
prometheus.exporter.unix "local_system" {
|
||||
enable_collectors = ["systemd"]
|
||||
enable_collectors = ["systemd", "textfile"]
|
||||
textfile {
|
||||
directory = "/var/lib/node_exporter_textfile/"
|
||||
}
|
||||
}
|
||||
|
||||
prometheus.scrape "scrape_metrics" {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud
|
||||
nextcloud__version: 34
|
||||
# renovate: datasource=docker depName=docker.io/library/postgres
|
||||
nextcloud__postgres_version: 15.18
|
||||
nextcloud__postgres_version: 15.19
|
||||
nextcloud__fqdn: cloud.hamburg.ccc.de
|
||||
nextcloud__data_dir: /data/nextcloud
|
||||
nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
|
||||
netbox__version: "v4.6.4"
|
||||
netbox__version: "v4.7.4"
|
||||
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
|
||||
netbox__custom_pipeline_oidc_group_and_role_mapping: true
|
||||
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@ nginx__configurations:
|
|||
content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/pad/nginx/pad.hamburg.ccc.de.conf') }}"
|
||||
|
||||
# renovate: datasource=docker depName=quay.io/hedgedoc/hedgedoc
|
||||
host_pad__docker_compose__hedgedoc_version: 1.11.1
|
||||
host_pad__docker_compose__hedgedoc_version: 1.12.0
|
||||
|
|
|
|||
|
|
@ -50,7 +50,10 @@ alloy_config_default: |
|
|||
}
|
||||
|
||||
prometheus.exporter.unix "local_system" {
|
||||
enable_collectors = ["systemd"]
|
||||
enable_collectors = ["systemd", "textfile"]
|
||||
textfile {
|
||||
directory = "/var/lib/node_exporter_textfile/"
|
||||
}
|
||||
}
|
||||
|
||||
prometheus.scrape "scrape_metrics" {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
services:
|
||||
|
||||
prometheus:
|
||||
image: docker.io/prom/prometheus:v3.13.1
|
||||
image: docker.io/prom/prometheus:v3.15.1
|
||||
container_name: prometheus
|
||||
command:
|
||||
- '--config.file=/etc/prometheus/prometheus.yml'
|
||||
|
|
@ -19,7 +19,7 @@ services:
|
|||
- prom_data:/prometheus
|
||||
|
||||
alertmanager:
|
||||
image: docker.io/prom/alertmanager:v0.33.1
|
||||
image: docker.io/prom/alertmanager:v0.34.2
|
||||
container_name: alertmanager
|
||||
command:
|
||||
- '--config.file=/etc/alertmanager/alertmanager.yaml'
|
||||
|
|
@ -32,7 +32,7 @@ services:
|
|||
- alertmanager_data:/alertmanager
|
||||
|
||||
grafana:
|
||||
image: docker.io/grafana/grafana:13.1.0
|
||||
image: docker.io/grafana/grafana:13.3.0
|
||||
container_name: grafana
|
||||
ports:
|
||||
- 3000:3000
|
||||
|
|
@ -46,7 +46,7 @@ services:
|
|||
- graf_data:/var/lib/grafana
|
||||
|
||||
pve-exporter:
|
||||
image: docker.io/prompve/prometheus-pve-exporter:3.9.0
|
||||
image: docker.io/prompve/prometheus-pve-exporter:3.11.0
|
||||
container_name: pve-exporter
|
||||
ports:
|
||||
- 9221:9221
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ services:
|
|||
|
||||
# Renders the PDF handouts (HTML to PDF with Chromium); needs internet access for the map tiles.
|
||||
gotenberg:
|
||||
image: docker.io/gotenberg/gotenberg:8.38.1
|
||||
image: docker.io/gotenberg/gotenberg:8.39.0
|
||||
command: ["gotenberg", "--api-timeout=60s", "--libreoffice-disable-routes"]
|
||||
networks:
|
||||
frontend:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
services:
|
||||
ntfy:
|
||||
image: docker.io/binwiederhier/ntfy:v2.26.0
|
||||
image: docker.io/binwiederhier/ntfy:v2.37.1
|
||||
container_name: ntfy
|
||||
command:
|
||||
- serve
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ services:
|
|||
- pretalx_net
|
||||
|
||||
redis:
|
||||
image: docker.io/library/redis:8.8.0
|
||||
image: docker.io/library/redis:8.10.3
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- redis:/data
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ services:
|
|||
restart: unless-stopped
|
||||
|
||||
redis:
|
||||
image: docker.io/library/redis:8.8.0
|
||||
image: docker.io/library/redis:8.10.3
|
||||
ports:
|
||||
- "6379:6379"
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
services:
|
||||
database:
|
||||
image: docker.io/library/postgres:18.4
|
||||
image: docker.io/library/postgres:18.6
|
||||
restart: always
|
||||
volumes:
|
||||
- ./database:/var/lib/postgresql
|
||||
|
|
@ -16,7 +16,7 @@ services:
|
|||
- gatus
|
||||
|
||||
gatus:
|
||||
image: ghcr.io/twin/gatus:v5.36.0
|
||||
image: ghcr.io/twin/gatus:v5.38.0
|
||||
restart: always
|
||||
ports:
|
||||
- "8080:8080"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,14 @@
|
|||
---
|
||||
- name: Deploy Grafana Alloy with config
|
||||
block:
|
||||
- name: Create directory for node_exporter textfile collector
|
||||
ansible.builtin.file:
|
||||
path: /var/lib/node_exporter_textfile
|
||||
state: directory
|
||||
mode: "0755"
|
||||
owner: root
|
||||
group: root
|
||||
|
||||
- name: Install Alloy
|
||||
ansible.builtin.include_tasks: install.yaml
|
||||
|
||||
|
|
|
|||
|
|
@ -19,5 +19,6 @@ ExecStart=/usr/local/lib/ansible_pull_venv/bin/ansible-pull \
|
|||
--inventory "{{ ansible_pull__inventory }}" \
|
||||
"{{ ansible_pull__playbook }}"
|
||||
User={{ ansible_pull__user }}
|
||||
ExecStartPost=/usr/bin/bash -c 'echo "ansible_pull_last_successful_run_timestamp_seconds $(date +%s)" > /var/lib/node_exporter_textfile/ansible_pull.prom.$$; mv /var/lib/node_exporter_textfile/ansible_pull.prom.$$ /var/lib/node_exporter_textfile/ansible_pull.prom'
|
||||
# Reboot, if /var/run/reboot-required or /var/run/ansible-reboot-required exist.
|
||||
ExecStartPost=/usr/bin/bash -c 'if [ -e /var/run/reboot-required ] || [ -e /var/run/ansible-reboot-required ]; then sudo systemctl reboot; fi'
|
||||
|
|
|
|||
Loading…
Reference in a new issue