fix all ansible-lint yaml errors (except for line-length)
This commit is contained in:
		
					parent
					
						
							
								a6453711d8
							
						
					
				
			
			
				commit
				
					
						4060dbbe21
					
				
			
		
					 15 changed files with 759 additions and 761 deletions
				
			
		|  | @ -1,10 +1,9 @@ | |||
| apiVersion: 1 | ||||
| 
 | ||||
| datasources: | ||||
| - name: Prometheus | ||||
|   type: prometheus | ||||
|   url: http://prometheus:9090  | ||||
|   isDefault: true | ||||
|   access: proxy | ||||
|   editable: true | ||||
| 
 | ||||
|   - name: Prometheus | ||||
|     type: prometheus | ||||
|     url: http://prometheus:9090 | ||||
|     isDefault: true | ||||
|     access: proxy | ||||
|     editable: true | ||||
|  |  | |||
|  | @ -5,110 +5,110 @@ global: | |||
| 
 | ||||
| alerting: | ||||
|   alertmanagers: | ||||
|   - scheme: http | ||||
|     timeout: 10s | ||||
|     static_configs: | ||||
|     - targets: | ||||
|       - "alertmanager:9093" | ||||
|     - scheme: http | ||||
|       timeout: 10s | ||||
|       static_configs: | ||||
|         - targets: | ||||
|             - "alertmanager:9093" | ||||
| 
 | ||||
| rule_files: | ||||
|   - "/etc/prometheus/rules/*.rules.yaml" | ||||
| 
 | ||||
| scrape_configs: | ||||
| - job_name: prometheus | ||||
|   honor_timestamps: true | ||||
|   metrics_path: /metrics | ||||
|   scheme: http | ||||
|   static_configs: | ||||
|   - targets: | ||||
|     - localhost:9090 | ||||
| - job_name: alertmanager | ||||
|   honor_timestamps: true | ||||
|   metrics_path: /metrics | ||||
|   scheme: http | ||||
|   static_configs: | ||||
|   - targets: | ||||
|     - alertmanager:9093 | ||||
| - job_name: c3lingo | ||||
|   honor_timestamps: true | ||||
|   scrape_interval: 5s | ||||
|   scrape_timeout: 1s | ||||
|   metrics_path: /mumblestats/metrics | ||||
|   scheme: https | ||||
|   static_configs: | ||||
|   - targets: | ||||
|     - mumble.c3lingo.org:443 | ||||
| - job_name: mumble | ||||
|   honor_timestamps: true | ||||
|   scrape_interval: 5s | ||||
|   scrape_timeout: 1s | ||||
|   metrics_path: /metrics | ||||
|   scheme: https | ||||
|   static_configs: | ||||
|   - targets: | ||||
|     - mumble.hamburg.ccc.de:443 | ||||
| - job_name: opnsense-ccchh | ||||
|   honor_timestamps: true | ||||
|   metrics_path: /metrics | ||||
|   scheme: http | ||||
|   static_configs: | ||||
|   - targets: | ||||
|     - 185.161.129.132:9100 | ||||
| - job_name: jitsi | ||||
|   honor_timestamps: true | ||||
|   scrape_interval: 5s | ||||
|   scrape_timeout: 1s | ||||
|   metrics_path: /metrics | ||||
|   scheme: http | ||||
|   static_configs: | ||||
|   - targets: | ||||
|     - jitsi.hamburg.ccc.de:9888 # Jitsi Video Bridge | ||||
| - job_name: 'pve' | ||||
|   static_configs: | ||||
|     - targets: | ||||
|       - 212.12.48.126  # chaosknoten | ||||
|   metrics_path: /pve | ||||
|   params: | ||||
|     module: [default] | ||||
|     cluster: ['1'] | ||||
|     node: ['1'] | ||||
|   relabel_configs: | ||||
|     - source_labels: [__address__] | ||||
|       target_label: __param_target | ||||
|     - source_labels: [__param_target] | ||||
|       target_label: instance | ||||
|     - target_label: __address__ | ||||
|       replacement: pve-exporter:9221 | ||||
| - job_name: hosts | ||||
|   static_configs: | ||||
|     # Wieske Chaosknoten VMs | ||||
|     - labels: | ||||
|         site: wieske | ||||
|         type: virtual_machine | ||||
|         hypervisor: chaosknoten | ||||
|       targets: | ||||
|         - netbox-intern.hamburg.ccc.de:9100 | ||||
|         - matrix-intern.hamburg.ccc.de:9100 | ||||
|         - public-web-static-intern.hamburg.ccc.de:9100 | ||||
|         - git-intern.hamburg.ccc.de:9100 | ||||
|         - forgejo-actions-runner-intern.hamburg.ccc.de:9100 | ||||
|         - eh22-wiki-intern.hamburg.ccc.de:9100 | ||||
|         - nix-box-june-intern.hamburg.ccc.de:9100 | ||||
|         - mjolnir-intern.hamburg.ccc.de:9100 | ||||
|         - woodpecker-intern.hamburg.ccc.de:9100 | ||||
|         - penpot-intern.hamburg.ccc.de:9100 | ||||
|         - jitsi.hamburg.ccc.de:9100 | ||||
|         - onlyoffice-intern.hamburg.ccc.de:9100 | ||||
|         - ccchoir-intern.hamburg.ccc.de:9100 | ||||
|         - tickets-intern.hamburg.ccc.de:9100 | ||||
|         - keycloak-intern.hamburg.ccc.de:9100 | ||||
|         - onlyoffice-intern.hamburg.ccc.de:9100 | ||||
|         - pad-intern.hamburg.ccc.de:9100 | ||||
|         - wiki-intern.hamburg.ccc.de:9100 | ||||
|         - zammad-intern.hamburg.ccc.de:9100 | ||||
|         - pretalx-intern.hamburg.ccc.de:9100 | ||||
|     - labels: | ||||
|         site: wieske | ||||
|         type: physical_machine | ||||
|       targets: | ||||
|         - chaosknoten.hamburg.ccc.de:9100 | ||||
|   - job_name: prometheus | ||||
|     honor_timestamps: true | ||||
|     metrics_path: /metrics | ||||
|     scheme: http | ||||
|     static_configs: | ||||
|       - targets: | ||||
|           - localhost:9090 | ||||
|   - job_name: alertmanager | ||||
|     honor_timestamps: true | ||||
|     metrics_path: /metrics | ||||
|     scheme: http | ||||
|     static_configs: | ||||
|       - targets: | ||||
|           - alertmanager:9093 | ||||
|   - job_name: c3lingo | ||||
|     honor_timestamps: true | ||||
|     scrape_interval: 5s | ||||
|     scrape_timeout: 1s | ||||
|     metrics_path: /mumblestats/metrics | ||||
|     scheme: https | ||||
|     static_configs: | ||||
|       - targets: | ||||
|           - mumble.c3lingo.org:443 | ||||
|   - job_name: mumble | ||||
|     honor_timestamps: true | ||||
|     scrape_interval: 5s | ||||
|     scrape_timeout: 1s | ||||
|     metrics_path: /metrics | ||||
|     scheme: https | ||||
|     static_configs: | ||||
|       - targets: | ||||
|           - mumble.hamburg.ccc.de:443 | ||||
|   - job_name: opnsense-ccchh | ||||
|     honor_timestamps: true | ||||
|     metrics_path: /metrics | ||||
|     scheme: http | ||||
|     static_configs: | ||||
|       - targets: | ||||
|           - 185.161.129.132:9100 | ||||
|   - job_name: jitsi | ||||
|     honor_timestamps: true | ||||
|     scrape_interval: 5s | ||||
|     scrape_timeout: 1s | ||||
|     metrics_path: /metrics | ||||
|     scheme: http | ||||
|     static_configs: | ||||
|       - targets: | ||||
|           - jitsi.hamburg.ccc.de:9888 # Jitsi Video Bridge | ||||
|   - job_name: 'pve' | ||||
|     static_configs: | ||||
|       - targets: | ||||
|           - 212.12.48.126  # chaosknoten | ||||
|     metrics_path: /pve | ||||
|     params: | ||||
|       module: [ default ] | ||||
|       cluster: [ '1' ] | ||||
|       node: [ '1' ] | ||||
|     relabel_configs: | ||||
|       - source_labels: [ __address__ ] | ||||
|         target_label: __param_target | ||||
|       - source_labels: [ __param_target ] | ||||
|         target_label: instance | ||||
|       - target_label: __address__ | ||||
|         replacement: pve-exporter:9221 | ||||
|   - job_name: hosts | ||||
|     static_configs: | ||||
|       # Wieske Chaosknoten VMs | ||||
|       - labels: | ||||
|           site: wieske | ||||
|           type: virtual_machine | ||||
|           hypervisor: chaosknoten | ||||
|         targets: | ||||
|           - netbox-intern.hamburg.ccc.de:9100 | ||||
|           - matrix-intern.hamburg.ccc.de:9100 | ||||
|           - public-web-static-intern.hamburg.ccc.de:9100 | ||||
|           - git-intern.hamburg.ccc.de:9100 | ||||
|           - forgejo-actions-runner-intern.hamburg.ccc.de:9100 | ||||
|           - eh22-wiki-intern.hamburg.ccc.de:9100 | ||||
|           - nix-box-june-intern.hamburg.ccc.de:9100 | ||||
|           - mjolnir-intern.hamburg.ccc.de:9100 | ||||
|           - woodpecker-intern.hamburg.ccc.de:9100 | ||||
|           - penpot-intern.hamburg.ccc.de:9100 | ||||
|           - jitsi.hamburg.ccc.de:9100 | ||||
|           - onlyoffice-intern.hamburg.ccc.de:9100 | ||||
|           - ccchoir-intern.hamburg.ccc.de:9100 | ||||
|           - tickets-intern.hamburg.ccc.de:9100 | ||||
|           - keycloak-intern.hamburg.ccc.de:9100 | ||||
|           - onlyoffice-intern.hamburg.ccc.de:9100 | ||||
|           - pad-intern.hamburg.ccc.de:9100 | ||||
|           - wiki-intern.hamburg.ccc.de:9100 | ||||
|           - zammad-intern.hamburg.ccc.de:9100 | ||||
|           - pretalx-intern.hamburg.ccc.de:9100 | ||||
|       - labels: | ||||
|           site: wieske | ||||
|           type: physical_machine | ||||
|         targets: | ||||
|           - chaosknoten.hamburg.ccc.de:9100 | ||||
|  |  | |||
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							|  | @ -5,21 +5,21 @@ services: | |||
|     container_name: mailman-core | ||||
|     hostname: mailman-core | ||||
|     volumes: | ||||
|     - /opt/mailman/core:/opt/mailman/ | ||||
|       - /opt/mailman/core:/opt/mailman/ | ||||
|     stop_grace_period: 30s | ||||
|     links: | ||||
|     - database:database | ||||
|       - database:database | ||||
|     depends_on: | ||||
|     - database | ||||
|       - database | ||||
|     environment: | ||||
|     - DATABASE_URL=postgresql://mailman:wvQjbMRnwFuxGEPz@database/mailmandb | ||||
|     - DATABASE_TYPE=postgres | ||||
|     - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase | ||||
|     - HYPERKITTY_API_KEY=ITfRjushI6FP0TLMnRpZxlfB2e17DN86 | ||||
|     - MTA=postfix | ||||
|       - DATABASE_URL=postgresql://mailman:wvQjbMRnwFuxGEPz@database/mailmandb | ||||
|       - DATABASE_TYPE=postgres | ||||
|       - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase | ||||
|       - HYPERKITTY_API_KEY=ITfRjushI6FP0TLMnRpZxlfB2e17DN86 | ||||
|       - MTA=postfix | ||||
|     ports: | ||||
|     - "127.0.0.1:8001:8001" # API | ||||
|     - "127.0.0.1:8024:8024" # LMTP - incoming emails | ||||
|       - "127.0.0.1:8001:8001" # API | ||||
|       - "127.0.0.1:8024:8024" # LMTP - incoming emails | ||||
|     networks: | ||||
|       mailman: | ||||
| 
 | ||||
|  | @ -29,36 +29,36 @@ services: | |||
|     container_name: mailman-web | ||||
|     hostname: mailman-web | ||||
|     depends_on: | ||||
|     - database | ||||
|       - database | ||||
|     links: | ||||
|     - mailman-core:mailman-core | ||||
|     - database:database | ||||
|       - mailman-core:mailman-core | ||||
|       - database:database | ||||
|     volumes: | ||||
|     - /opt/mailman/web:/opt/mailman-web-data | ||||
|       - /opt/mailman/web:/opt/mailman-web-data | ||||
|     environment: | ||||
|     - DATABASE_TYPE=postgres | ||||
|     - DATABASE_URL=postgresql://mailman:wvQjbMRnwFuxGEPz@database/mailmandb | ||||
|     - "DJANGO_ALLOWED_HOSTS=lists.hamburg.ccc.de,lists.c3lingo.org" | ||||
|     - HYPERKITTY_API_KEY=ITfRjushI6FP0TLMnRpZxlfB2e17DN86 | ||||
|     - SERVE_FROM_DOMAIN=lists.hamburg.ccc.de | ||||
|     - SECRET_KEY=ugfknEYBaFVc62R1jlIjnkizQaqr7tSt | ||||
|     - MAILMAN_ADMIN_USER=ccchh-admin | ||||
|     - MAILMAN_ADMIN_EMAIL=tony@cowtest.hamburg.ccc.de | ||||
|       - DATABASE_TYPE=postgres | ||||
|       - DATABASE_URL=postgresql://mailman:wvQjbMRnwFuxGEPz@database/mailmandb | ||||
|       - "DJANGO_ALLOWED_HOSTS=lists.hamburg.ccc.de,lists.c3lingo.org" | ||||
|       - HYPERKITTY_API_KEY=ITfRjushI6FP0TLMnRpZxlfB2e17DN86 | ||||
|       - SERVE_FROM_DOMAIN=lists.hamburg.ccc.de | ||||
|       - SECRET_KEY=ugfknEYBaFVc62R1jlIjnkizQaqr7tSt | ||||
|       - MAILMAN_ADMIN_USER=ccchh-admin | ||||
|       - MAILMAN_ADMIN_EMAIL=tony@cowtest.hamburg.ccc.de | ||||
|     ports: | ||||
|     - "127.0.0.1:8000:8000" # HTTP | ||||
|     - "127.0.0.1:8080:8080" # uwsgi | ||||
|       - "127.0.0.1:8000:8000" # HTTP | ||||
|       - "127.0.0.1:8080:8080" # uwsgi | ||||
|     networks: | ||||
|       mailman: | ||||
| 
 | ||||
|   database: | ||||
|     restart: unless-stopped | ||||
|     environment: | ||||
|     - POSTGRES_DB=mailmandb | ||||
|     - POSTGRES_USER=mailman | ||||
|     - POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz | ||||
|       - POSTGRES_DB=mailmandb | ||||
|       - POSTGRES_USER=mailman | ||||
|       - POSTGRES_PASSWORD=wvQjbMRnwFuxGEPz | ||||
|     image: postgres:12-alpine | ||||
|     volumes: | ||||
|     - /opt/mailman/database:/var/lib/postgresql/data | ||||
|       - /opt/mailman/database:/var/lib/postgresql/data | ||||
|     networks: | ||||
|       mailman: | ||||
| 
 | ||||
|  | @ -68,5 +68,5 @@ networks: | |||
|     ipam: | ||||
|       driver: default | ||||
|       config: | ||||
|       - | ||||
|         subnet: 172.19.199.0/24 | ||||
|         - | ||||
|           subnet: 172.19.199.0/24 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue