run monitoring-test container per environment and add mujina containers

Author: JCLSurf

roles/monitoring-tests-docker/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-#health_checks:
-#  - name: env1
-#    port: 80
-#  - name: env2
-#    port: 8080 
+health_checks:
+  - acc
+  - prd

roles/monitoring-tests-docker/tasks/create_monitoring.yml

@@ -0,0 +1,47 @@
+- name: Retrieve vars from environments inventory
+  ansible.builtin.include_vars: 
+    dir: "{{ inventory_dir }}/../{{ env }}/group_vars/"
+
+- name: Retrieve secrets from environments inventory
+  ansible.builtin.include_vars: 
+    file: "{{ inventory_dir }}/../{{ env }}/secrets/secrets.yml"
+
+- name: Create mujina idp container
+  ansible.builtin.include_role:
+    name: mujina-idp
+  vars:
+    mujina_idp_container: "mujina-idp-{{ env }}"
+    mujina_idp_dir_docker: "/opt/openconext/mujina_idp_{{ env }}"
+
+- name: Create mujina sp container
+  ansible.builtin.include_role:
+    name: mujina-sp
+  vars:
+    mujina_sp_container: "mujina-sp-{{ env }}"
+    mujina_sp_dir_docker: "/opt/openconext/mujina_sp_{{ env }}"
+
+- name: Place health scripts
+  ansible.builtin.template:
+    src: templates/check.sh.j2
+    dest: "/opt/openconext/health_check_{{ env }}/check.sh"
+    mode: 0755
+
+- name: Place application.yml for set environments
+  ansible.builtin.template:
+    src: templates/application.yml.j2
+    dest: "/opt/openconext/health_check_{{ env }}/application.yml"
+    mode: 0644
+
+- name: Start monitoring tests docker container(s)
+  community.docker.docker_container:
+    name: "monitoring-{{ env }}"
+    image: "ghcr.io/openconext/openconext-monitoring/monitoring:latest"
+    state: started
+    restart_policy: "always"
+    recreate: false
+    ports: 
+      - "{{ monitoring_tests.port }}:{{ monitoring_tests.port }}"
+    mounts: 
+      - type: bind
+        source: "/opt/openconext/health_check_{{ env }}/application.yml"
+        target: /application.yml

roles/monitoring-tests-docker/tasks/main.yml

@@ -1,41 +1,26 @@
 ---
-- name: Start monitoring tests docker container
-  community.docker.docker_container:
-    name: "monitoring"
-    image: "ghcr.io/openconext/openconext-monitoring/monitoring:latest"
-    state: started
-    restart_policy: "always"
-    recreate: false
-    networks:
-      - name: "loadbalancer"
-
-- name: Create required directories for health check scripts
+- name: Create required directories for health check scripts in /opt
   ansible.builtin.file:
     state: directory
-    path: "/opt/health_check_{{ item.name }}"
+    path: "/opt/openconext/health_check_{{ item }}"
     owner: root
     group: root
     mode: 0755
   with_items: "{{ health_checks }}"
-  when: health_checks is defined
 
 - name: Make sure nrpe directory exists
   ansible.builtin.file:
     state: directory
     path: /etc/nrpe.d
-  when: health_checks is defined
 
-- name: Place health scripts
-  ansible.builtin.template:
-    src: templates/check.sh.j2
-    dest: "/opt/health_check_{{ item.name }}/check.sh"
-    mode: 0755
+- name: Place monitoring files per environment
+  include_tasks: create_monitoring.yml
   with_items: "{{ health_checks }}"
-  when: health_checks is defined
+  loop_control:
+    loop_var: "env"
 
-- name: Place nrpe config file
+- name: Place nagios config file
   ansible.builtin.lineinfile:
-    line: "command[check_health_prd]=/opt/health_check_{{ item.name }}/check.sh"
+    line: "command[check_health_prd]=/opt/openconext/health_check_{{ item }}/check.sh"
     dest: "/etc/nrpe.d/check_components.cfg"
   with_items: "{{ health_checks }}"
-  when: health_checks is defined

roles/monitoring-tests-docker/templates/application.yml.j2

@@ -0,0 +1,58 @@
+logging:
+  config: classpath:logback.xml
+
+server:
+  # The port to where this Spring Boot application listens to.
+  port: {{ monitoring_tests.port }}
+
+eb:
+  metadata_sp_url: {{ monitoring_tests.metadata_sp_url }}
+  metadata_idp_url: {{ monitoring_tests.metadata_idp_url }}
+  mujina_sp_base_url: http://localhost:{{ monitoring_tests.mujina_sp_port }}
+  mujina_idp_entity_id: {{ mujina_idp.entity_id }}
+  mujina_username: monitor-user
+
+pdp:
+  user: {{ pdp.username }}
+  password: {{ pdp.password }}
+  idp_entity_id: https://engine.{{ base_domain }}/authentication/idp/metadata
+  sp_entity_id: https://engine.{{ base_domain }}/authentication/sp/metadata
+  base_url: https://pdp.{{ base_domain }}
+
+voot:
+  oidc:
+    authorization_url: https://connect.{{ base_domain }}/oidc/token
+    voot_base_url: https://voot.{{ base_domain }}
+    client_id: monitoring.{{ base_domain }}
+    secret: {{ monitoring_tests_oidcng_client_secret }}
+    person_id: {{ monitoring_tests.person_id }}
+
+oidcng:
+  base_url: https://connect.{{ base_domain }}/oidc
+  client_id: {{ monitoring_tests.oidcng_client_id }}
+  secret: {{ monitoring_tests_oidcng_client_secret }}
+  resource_server_id: {{ monitoring_tests.oidcng_resource_server_id }}
+  resource_server_secret: {{ monitoring_tests_oidcng_resource_server_secret }}
+
+# We disable all endpoints except health for the load-balancer and info for git information.
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "health,info"
+  endpoint:
+    info:
+      enabled: true
+    health:
+      show-details: always
+    mappings:
+      enabled: true
+  info:
+    git:
+      mode: full
+
+# used by the git plugin
+info:
+  build:
+    artifact: "@project.artifactId@"
+    version: "@project.version@"

roles/monitoring-tests-docker/templates/check.sh.j2

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-JSON=`curl -s 'http://localhost:{{ item.port }}/actuator/health'`
+JSON=`curl -s 'http://localhost:{{ monitoring_tests.port }}/actuator/health'`
 ss=`echo $JSON | python3 -c "import sys, json; print(json.load(sys.stdin)['status'])"`
 mms=`echo $JSON | python3 -c "import sys, json; print(json.load(sys.stdin)['components']['metadataMonitor']['status'])"`
 sps=`echo $JSON | python3 -c "import sys, json; print(json.load(sys.stdin)['components']['samlProxyMonitor']['status'])"`

roles/mujina-idp/tasks/main.yml

@@ -25,7 +25,7 @@
 
 - name: Create and start the server container
   community.docker.docker_container:
-    name: mujina-idp
+    name: "{{ mujina_idp_container | default ('mujina-idp') }}"
     image: ghcr.io/openconext/mujina/mujina-idp:{{ mujina_version }}
     pull: true
     restart_policy: "always"
@@ -45,7 +45,7 @@
     labels:
       traefik.http.routers.mujina-idp.rule: "Host(`mujina-idp.{{ base_domain }}`)"
       traefik.http.routers.mujina-idp.tls: "true"
-      traefik.http.services.mujina-idp.loadbalancer.server.port: "8080"
+      traefik.http.services.mujina-idp.loadbalancer.server.port: "{{ mujina_idp_port | default('8080') }}"
       traefik.enable: "true"
     healthcheck:
       test:
@@ -55,7 +55,7 @@
           "-no-verbose",
           "--tries=1",
           "--spider",
-          "http://localhost:8080/internal/health",
+          "http://localhost:{{ mujina_idp_port | default('8080') }}/internal/health",
         ]
       interval: 10s
       timeout: 10s

roles/mujina-sp/tasks/main.yml

@@ -25,7 +25,7 @@
 
 - name: Create and start the server container
   community.docker.docker_container:
-    name: mujina-sp
+    name: "{{ mujina_sp_container | default ('mujina-sp') }}"
     image: ghcr.io/openconext/mujina/mujina-sp:{{ mujina_version }}
     pull: true
     restart_policy: "always"
@@ -45,7 +45,7 @@
     labels:
       traefik.http.routers.mujina-sp.rule: "Host(`mujina-sp.{{ base_domain }}`)"
       traefik.http.routers.mujina-sp.tls: "true"
-      traefik.http.services.mujina-sp.loadbalancer.server.port: "9090"
+      traefik.http.services.mujina-sp.loadbalancer.server.port: "{{ mujina_sp_port | default('9090') }}"
       traefik.enable: "true"
     healthcheck:
       test:
@@ -55,7 +55,7 @@
           "-no-verbose",
           "--tries=1",
           "--spider",
-          "http://localhost:9090/internal/health",
+          "http://localhost:{{ mujina_sp_port | default('9090') }}/internal/health",
         ]
       interval: 10s
       timeout: 10s