diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml index 0734c92..c5716bf 100644 --- a/ansible/inventory/group_vars/all.yml +++ b/ansible/inventory/group_vars/all.yml @@ -1,6 +1,5 @@ data_directory_base: /mnt/data git_ssh_port: 56287 -elasticsearch_port: 14653 concourse_public_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBSVLcr617iJt+hqLFSsOQy1JeueLIAj1eRfuI+KeZAu pim@x260" nfs_shares: @@ -38,12 +37,6 @@ nfs_shares: path: /mnt/data/overleaf/mongodb - name: prometheus_data path: /mnt/data/prometheus/data - - name: elasticsearch_certs - path: /mnt/data/elasticsearch/certs - - name: elasticsearch_data - path: /mnt/data/elasticsearch/data - - name: grafana_data - path: /mnt/data/grafana/data database_passwords: nextcloud: !vault | diff --git a/ansible/inventory/hosts.yml b/ansible/inventory/hosts.yml index a0e4d38..b7bce70 100644 --- a/ansible/inventory/hosts.yml +++ b/ansible/inventory/hosts.yml @@ -9,5 +9,3 @@ all: hosts: bancomart: ansible_host: bancomart.dmz - handjecontantje: - ansible_host: handjecontantje.dmz diff --git a/ansible/playbooks/setup.yml b/ansible/playbooks/setup.yml index 7b06092..a731fd3 100644 --- a/ansible/playbooks/setup.yml +++ b/ansible/playbooks/setup.yml @@ -53,10 +53,3 @@ authorized_key: user: root key: "{{ concourse_public_key }}" - -- hosts: manager, workers - tasks: - - name: Increase vm.max_map_count - sysctl: - name: vm.max_map_count - value: 262144 diff --git a/ansible/playbooks/stacks.yml b/ansible/playbooks/stacks.yml index 5453fd0..a46c7d8 100644 --- a/ansible/playbooks/stacks.yml +++ b/ansible/playbooks/stacks.yml @@ -20,4 +20,3 @@ - {role: nextcloud, tags: nextcloud} - {role: syncthing, tags: syncthing} - {role: prometheus, tags: prometheus} - - {role: monitoring, tags: monitoring} diff --git a/ansible/roles/monitoring/docker-stack.yml.j2 b/ansible/roles/monitoring/docker-stack.yml.j2 deleted file mode 100644 index bf8f9db..0000000 --- a/ansible/roles/monitoring/docker-stack.yml.j2 +++ /dev/null @@ -1,98 +0,0 @@ -# vi: ft=yaml -version: "3.8" - -networks: - traefik: - external: true - -configs: - esdatasource: - external: true - name: "{{ esdatasource.config_name }}" - -volumes: - escerts: - driver_opts: - type: "nfs" - o: "addr=192.168.30.10,nolock,soft,rw" - device: ":/mnt/data/elasticsearch/certs" - esdata: - driver_opts: - type: "nfs" - o: "addr=192.168.30.10,nolock,soft,rw" - device: ":/mnt/data/elasticsearch/data" - grafanadata: - driver_opts: - type: "nfs" - o: "addr=192.168.30.10,nolock,soft,rw" - device: ":/mnt/data/grafana/data" - -services: - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.8.1 - volumes: - - type: volume - source: escerts - target: /usr/share/elasticsearch/config/certs - volume: - nocopy: true - - type: volume - source: esdata - target: /usr/share/elasticsearch/data - volume: - nocopy: true - ports: - - {{ elasticsearch_port }}:9200 - environment: - - node.name=es01 - - cluster.name=shoarma - - cluster.initial_master_nodes=es01 - - bootstrap.memory_lock=true - - xpack.security.enabled=false - - xpack.security.http.ssl.enabled=false - - xpack.security.http.ssl.key=certs/es01/es01.key - - xpack.security.http.ssl.certificate=certs/es01/es01.crt - - xpack.security.http.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.enabled=false - - xpack.security.transport.ssl.key=certs/es01/es01.key - - xpack.security.transport.ssl.certificate=certs/es01/es01.crt - - xpack.security.transport.ssl.certificate_authorities=certs/ca/ca.crt - - xpack.security.transport.ssl.verification_mode=certificate - - xpack.license.self_generated.type=basic - ulimits: - memlock: - soft: -1 - hard: -1 - healthcheck: - test: - [ - "CMD-SHELL", - "curl http://localhost:9200 | grep -q 'You Know, for Search'", - ] - interval: 10s - timeout: 10s - retries: 120 - - grafana: - image: grafana/grafana-oss - networks: - - traefik - deploy: - labels: - - traefik.enable=true - - traefik.http.routers.grafana.entrypoints=localsecure - - traefik.http.routers.grafana.rule=Host(`grafana.kun.is`) - - traefik.http.routers.grafana.tls=true - - traefik.http.routers.grafana.tls.certresolver=letsencrypt - - traefik.http.routers.grafana.service=grafana - - traefik.http.services.grafana.loadbalancer.server.port=3000 - - traefik.docker.network=traefik - volumes: - - type: volume - source: grafanadata - target: /var/lib/grafana - volume: - nocopy: true - configs: - - source: esdatasource - target: /etc/grafana/provisioning/datasources/elasticsearch.yaml diff --git a/ansible/roles/monitoring/elasticsearch.yml b/ansible/roles/monitoring/elasticsearch.yml deleted file mode 100644 index a898f3e..0000000 --- a/ansible/roles/monitoring/elasticsearch.yml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: 1 - -datasources: - - name: Elasticsearch - type: elasticsearch - access: proxy - url: http://maestro.dmz:14653 - jsonData: - # index: '[metrics-]YYYY.MM.DD' - interval: Daily - timeField: '@timestamp' - diff --git a/ansible/roles/monitoring/tasks/main.yml b/ansible/roles/monitoring/tasks/main.yml deleted file mode 100644 index c5958c3..0000000 --- a/ansible/roles/monitoring/tasks/main.yml +++ /dev/null @@ -1,13 +0,0 @@ -- name: Create elasticsearch data source config - docker_config: - name: esdatasource - data: "{{ lookup('template', '{{ role_path }}/elasticsearch.yml') }}" - use_ssh_client: true - rolling_versions: true - register: esdatasource - -- name: Deploy Docker stack - docker_stack: - name: monitoring - compose: - - "{{ lookup('template', '{{ role_path }}/docker-stack.yml.j2') | from_yaml }}" diff --git a/terraform/main.tf b/terraform/main.tf index ccb2133..1c9cd32 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -24,11 +24,6 @@ provider "libvirt" { uri = "qemu+ssh://root@jefke.hyp/system" } -provider "libvirt" { - alias = "lewis" - uri = "qemu+ssh://root@lewis.hyp/system" -} - module "maestro" { source = "git::https://git.kun.is/home/tf-modules.git//debian" name = "maestro" @@ -49,13 +44,3 @@ module "bancomart" { libvirt = libvirt.jefke } } - -module "handjecontantje" { - source = "git::https://git.kun.is/home/tf-modules.git//debian" - name = "handjecontantje" - domain_name = "tf-handjecontantje" - memory = 3 * 1024 - providers = { - libvirt = libvirt.lewis - } -}