DEV-593 updated versions

group_vars/all/versions.yml

@@ -0,0 +1,29 @@
+---
+
+elastic_elasticsearch_version: "7.16.1"
+elastic_elasticsearch_exporter_version: "1.5.0"
+elastic_filebeat_version: "7.16.3"
+elastic_kibana_version: "7.16.1"
+elastic_logstash_version: "7.16.3"
+elastic_metricbeat_version: "7.16.3"
+
+gitea_version: "1.15"
+
+prom_grafana_version: "9.1.5"
+
+harbor_version: "v2.4.1"
+
+keycloak_version: "14.0.0.1"
+
+pgadmin4_version: "6.14"
+
+prom_alertmanager_version: "v0.24.0"
+prom_blackbox_exporter_version: "v0.22.0"
+prom_prometheus_version: "v2.38.0"
+prom_prom2teams_version: "3.2.3"
+
+traefik_version: "v2.8.5"
+
+connect_version: "10.2"
+iam_version: "10.0"
+webdav_version: "8.4.1"

group_vars/management/plain.yml

@@ -2,8 +2,6 @@
 
 hetzner_server_type: cx21
 
-connect_image_version: "9.0"
-
 connect_client_admin_username: "{{ management_admin_username }}"
 connect_client_admin_password: "{{ management_admin_password }}"
 connect_workflow_env: "stage:{{ stage }};smardigoUserToken:{{ smardigo_auth_token_value }}"

group_vars/stage_dev/plain.yml

@@ -291,10 +291,6 @@ harbor_oidc_client_secret: "{{ docker_registry_oidc_client_secret_vault }}"
 harbor_oidc_admin_username: "harbor-admin"
 harbor_oidc_admin_password: "harbor-admin"
 
-
-connect_image_version: "8.6"
-iam_image_version: "latest"
-
 management_oidc_realm: "management"
 management_oidc_client_id: "smardigo"
 

group_vars/stage_prodnso/plain.yml

@@ -291,10 +291,6 @@ harbor_oidc_client_secret: "{{ docker_registry_oidc_client_secret_vault }}"
 harbor_oidc_admin_username: "harbor-admin"
 harbor_oidc_admin_password: "{{ harbor_oidc_admin_password_vault }}"
 
-
-connect_image_version: "8.6"
-iam_image_version: "latest"
-
 management_oidc_realm: "management"
 management_oidc_client_id: "smardigo"
 

group_vars/stage_qa/plain.yml

@@ -291,10 +291,6 @@ harbor_oidc_client_secret: "{{ docker_registry_oidc_client_secret_vault }}"
 harbor_oidc_admin_username: "harbor-admin"
 harbor_oidc_admin_password: "{{ harbor_oidc_admin_password_vault }}"
 
-
-connect_image_version: "8.6"
-iam_image_version: "latest"
-
 management_oidc_realm: "management"
 management_oidc_client_id: "smardigo"
 

roles/connect/vars/main.yml

@@ -123,7 +123,7 @@ connect_docker: {
     {
       name: "{{ connect_id }}",
       image_name: "{{ connect_image_name }}",
-      image_version: "{{ connect_image_version }}",
+      image_version: "{{ connect_version }}",
       labels: "{{ connect_labels + ( connect_labels_additional | default([])) }}",
       restart: "{{ connect_service_restart | default('always') }}",
       environment: "{{ connect_environment + ( connect_environment_additional | default([])) }}",

roles/elastic/defaults/main.yaml

@@ -1,7 +1,4 @@
 ---
 
 elastic_image_name: "docker.elastic.co/elasticsearch/elasticsearch"
-elastic_image_version: "7.16.1"
-
 elasticsearch_exporter_image_name: "quay.io/prometheuscommunity/elasticsearch-exporter"
-elasticsearch_exporter_image_version: "latest"

roles/elastic/vars/main.yml

@@ -15,7 +15,7 @@ elastic_docker: {
     {
       name: "{{ elastic_id }}",
       image_name: "{{ elastic_image_name }}",
-      image_version: "{{ elastic_image_version }}",
+      image_version: "{{ elastic_elasticsearch_version }}",
       environment: [
         "ES_JAVA_OPTS: -Xms{{ JVM_HEAP_MB | default((ansible_memtotal_mb / 2) | round | int) }}m -Xmx{{ JVM_HEAP_MB | default((ansible_memtotal_mb / 2) | round | int) }}m",
         "ELASTIC_PASSWORD: \"{{ elastic_admin_password }}\"",
@@ -73,7 +73,7 @@ elastic_docker: {
     {
       name: "{{ elastic_exporter_id }}",
       image_name: "{{ elasticsearch_exporter_image_name }}",
-      image_version: "{{ elasticsearch_exporter_image_version }}",
+      image_version: "{{ elastic_elasticsearch_exporter_version }}",
       command: [
         '"--es.ca=/certificates/ca/ca.crt"',
         '"--es.uri=https://{{ elastic_admin_username }}:{{ elastic_admin_password }}@{{ inventory_hostname }}:9200"',

roles/filebeat/defaults/main.yaml

@@ -1,4 +1,3 @@
 ---
 
 filebeat_image_name: "docker.elastic.co/beats/filebeat"
-filebeat_image_version: "7.16.3"

roles/filebeat/vars/main.yml

@@ -7,7 +7,7 @@ filebeat_docker: {
     {
       name: "{{ filebeat_id }}",
       image_name: "{{ filebeat_image_name }}",
-      image_version: "{{ filebeat_image_version }}",
+      image_version: "{{ elastic_filebeat_version }}",
       user: root,
       environment: [
         "node.name: \"{{ filebeat_id }}\"",

roles/gitea/defaults/main.yml

@@ -1,4 +1,3 @@
 ---
 
 gitea_image_name: "gitea/gitea"
-gitea_image_version: "1.15"

roles/gitea/vars/main.yml

@@ -61,7 +61,7 @@ gitea_docker: {
     {
       name: "{{ gitea_id }}",
       image_name: "{{ gitea_image_name }}",
-      image_version: "{{ gitea_image_version }}",
+      image_version: "{{ gitea_version }}",
       labels: "{{ gitea_labels + ( gitea_labels_additional | default([])) }}",
       restart: "{{ gitea_service_restart | default('always') }}",
       environment: "{{ gitea_environment + ( gitea_environment_additional | default([])) }}",

roles/harbor/defaults/main.yml

@@ -1,7 +1,5 @@
 ---
 
-harbor_version: v2.4.1
-
 harbor_hostname: '{{ stage_server_domain }}'
 harbor_external_url: 'https://{{ stage_server_domain }}'
 

roles/iam/defaults/main.yml

@@ -1,4 +1,3 @@
 ---
 
 iam_image_name: '{{ shared_service_harbor_hostname }}/smardigo/iam-app'
-iam_image_version: 'latest'

roles/iam/vars/main.yml

@@ -40,7 +40,7 @@ iam_docker: {
     {
       name: "{{ iam_id }}",
       image_name: "{{ iam_image_name }}",
-      image_version: "{{ iam_image_version }}",
+      image_version: "{{ iam_version }}",
       labels: "{{ iam_labels + ( iam_labels_additional | default([])) }}",
       restart: "{{ iam_service_restart | default('always') }}",
       environment: [

roles/keycloak/defaults/main.yml

@@ -3,5 +3,4 @@
 # TODO doesn't bind to local port (currently used by setup keycloak with ansible)
 service_port_keycloak_external: "8110"
 
-keycloak_version: "14.0.0.1"
 keycloak_image: "{{ shared_service_harbor_hostname }}/smardigo/keycloak"

roles/kibana/defaults/main.yaml

@@ -1,7 +1,6 @@
 ---
 
 kibana_image_name: "docker.elastic.co/kibana/kibana"
-kibana_image_version: "7.16.1"
 
 kibana_advanced_settings:
   changes:

roles/kibana/vars/main.yml

@@ -23,7 +23,7 @@ elastic_docker: {
     {
       name: "{{ kibana_id }}",
       image_name: "{{ kibana_image_name }}",
-      image_version: "{{ kibana_image_version }}",
+      image_version: "{{ elastic_kibana_version }}",
       labels: "{{ kibana_labels + ( kibana_labels_additional | default([])) }}",
       environment: [
         "SERVER_NAME: {{ kibana_id }}",

roles/logstash/defaults/main.yaml

@@ -1,4 +1,3 @@
 ---
 
 logstash_image_name: "docker.elastic.co/logstash/logstash"
-logstash_image_version: "7.16.3"

roles/logstash/vars/main.yml

@@ -12,7 +12,7 @@ elastic_docker: {
     {
       name: "{{ logstash_id }}",
       image_name: "{{ logstash_image_name }}",
-      image_version: "{{ logstash_image_version }}",
+      image_version: "{{ elastic_logstash_version }}",
       environment: [
         "node.name: \"{{ logstash_id }}}}\"",
         "config.reload.automatic: \"true\"",

roles/management/tasks/connections.yml

@@ -23,7 +23,7 @@
   delegate_to: 127.0.0.1
   become: false
   uri:
-    url: "{{ http_s }}://{{ connect_base_url }}/api/datasource-connections"
+    url: "{{ http_s }}://{{ connect_base_url }}/api/v1/connections"
     method: GET
     headers:
       "Smardigo-User-Token": "{{ smardigo_auth_token_value }}"
@@ -52,7 +52,7 @@
   delegate_to: 127.0.0.1
   become: false
   uri:
-    url: "{{ http_s }}://{{ connect_base_url }}/api/datasource-connections"
+    url: "{{ http_s }}://{{ connect_base_url }}/api/v1/connections"
     method: "{% if item.id in connect_connection_ids %}PUT{% else %}POST{% endif %}"
     body_format: json
     body: '{{ item | to_json }}'

roles/metricbeat/defaults/main.yaml

@@ -1,4 +1,3 @@
 ---
 
 metricbeat_image_name: "docker.elastic.co/beats/metricbeat"
-metricbeat_image_version: "7.16.3"

roles/metricbeat/vars/main.yml

@@ -7,7 +7,7 @@ metricbeat_docker: {
     {
       name: "{{ metricbeat_id }}",
       image_name: "{{ metricbeat_image_name }}",
-      image_version: "{{ metricbeat_image_version }}",
+      image_version: "{{ elastic_metricbeat_version }}",
       user: root,
       environment: [
         "node.name: \"{{ metricbeat_id }}\"",

roles/node_exporter/defaults/main.yml

@@ -1 +0,0 @@
----

roles/node_exporter/vars/main.yml

@@ -1 +0,0 @@
----

roles/pgadmin4/defaults/main.yml

@@ -1,4 +1,3 @@
 ---
 
 pgadmin4_image_name: "dpage/pgadmin4"
-pgadmin4_image_version: "6"

roles/pgadmin4/vars/main.yml

@@ -22,7 +22,7 @@ pgadmin4_docker: {
     {
       name: "{{ pgadmin_id }}",
       image_name: "{{ pgadmin4_image_name }}",
-      image_version: "{{ pgadmin4_image_version }}",
+      image_version: "{{ pgadmin4_version }}",
       labels: [
         '"traefik.enable=true"',   
         '"traefik.http.routers.{{ pgadmin_id }}.service={{ pgadmin_id }}"',

roles/prometheus/defaults/main.yml

@@ -7,20 +7,15 @@ prometheus_datadir: "{{ prometheus_lvm_hcloudvol_mountpath }}"
 
 # https://github.com/prometheus/prometheus
 prometheus_image_name: "prom/prometheus"
-prometheus_image_version: "v2.38.0"
 
 # https://github.com/grafana/grafana
 grafana_image_name: "grafana/grafana"
-grafana_image_version: "9.1.5"
 
 # https://github.com/prometheus/alertmanager
 alertmanager_image_name: "prom/alertmanager"
-alertmanager_image_version: "v0.24.0"
 
 # https://github.com/prometheus/blackbox_exporter
 blackbox_exporter_image_name: "prom/blackbox-exporter"
-blackbox_exporter_image_version: "v0.22.0"
 
 # https://github.com/idealista/prom2teams
 prom2teams_image_name: "idealista/prom2teams"
-prom2teams_image_version: "3.2.3"

roles/prometheus/vars/main.yml

@@ -32,7 +32,7 @@ prometheus_docker: {
     {
       name: "{{ prometheus_id }}",
       image_name: "{{ prometheus_image_name }}",
-      image_version: "{{ prometheus_image_version }}",
+      image_version: "{{ prom_prometheus_version }}",
       labels: [
         '"traefik.enable=true"',
         '"traefik.http.routers.{{ prometheus_id }}.service={{ prometheus_id }}"',
@@ -64,7 +64,7 @@ prometheus_docker: {
     {
       name: "{{ alertmanager_id }}",
       image_name: "{{ alertmanager_image_name }}",
-      image_version: "{{ alertmanager_image_version }}",
+      image_version: "{{ prom_alertmanager_version }}",
       labels: [
         '"traefik.enable=true"',
         '"traefik.http.routers.{{ alertmanager_id }}.service={{ alertmanager_id }}"',
@@ -94,7 +94,7 @@ prometheus_docker: {
     {
       name: "{{ grafana_id }}",
       image_name: "{{ grafana_image_name }}",
-      image_version: "{{ grafana_image_version }}",
+      image_version: "{{ prom_grafana_version }}",
       user: '"472"',
       labels: [
         '"traefik.enable=true"',
@@ -121,7 +121,7 @@ prometheus_docker: {
     {
       name: "{{ prom2teams_id }}",
       image_name: "{{ prom2teams_image_name }}",
-      image_version: "{{ prom2teams_image_version }}",
+      image_version: "{{ prom_prom2teams_version }}",
       volumes: [
         '"./config/prom2teams/config.ini:/opt/prom2teams/config.ini"',
       ],

roles/traefik/defaults/main.yml

@@ -1,4 +1,3 @@
 ---
 
 traefik_image_name: "traefik"
-traefik_image_version: "v2.6"

roles/traefik/vars/main.yml

@@ -13,7 +13,7 @@ traefik_docker: {
     {
       name: "{{ traefik_id }}",
       image_name: "{{ traefik_image_name }}",
-      image_version: "{{ traefik_image_version }}",
+      image_version: "{{ traefik_version }}",
       environment: [
         'DO_AUTH_TOKEN: "{{ digitalocean_authentication_token }}"',
       ],

roles/webdav/defaults/main.yaml

@@ -1,4 +1,3 @@
 ---
 
 webdav_image_name: "{{ shared_service_harbor_hostname }}/smardigo/smardigo-webdav-app"
-webdav_image_version: "8.4.1"

roles/webdav/vars/main.yml

@@ -30,7 +30,7 @@ webdav_docker: {
     {
       name: "{{ webdav_id }}",
       image_name: "{{ webdav_image_name }}",
-      image_version: "{{ webdav_image_version }}",
+      image_version: "{{ webdav_version }}",
       labels: "{{ webdav_labels + ( webdav_labels_additional | default([])) }}",
       restart: "{{ webdav_service_restart | default('always') }}",
       user: root,

smardigo/provisioning/script/ansible-start.groovy

@@ -5,7 +5,7 @@ def env = [
   cluster_name: cluster.name,
   cluster_service: cluster.service,
   cluster_size: cluster.size,
-  connect_image_version: binding.hasVariable('connect') ? connect.version : 'latest',
+  connect_version: binding.hasVariable('connect') ? connect.version : 'latest',
   current_realm_name: tenant.key,
   current_realm_display_name: tenant.name,
   process_instance_id: execution.getProcessInstanceId(),

smardigo/provisioning/script/create-awx-paramaters.groovy

@@ -5,7 +5,7 @@ def env = [
   cluster_name: cluster.name,
   cluster_service: cluster.service,
   cluster_size: cluster.size,
-  connect_image_version: binding.hasVariable('connect') ? connect.version : 'latest',
+  connect_version: binding.hasVariable('connect') ? connect.version : 'latest',
   current_realm_name: tenant.key,
   current_realm_display_name: tenant.name,
   process_instance_id: execution.getProcessInstanceId(),

templates/traefik/traefik.toml.j2

@@ -23,10 +23,10 @@
     buckets = [0.1,0.3,1.2,5.0]
     entryPoint = "admin-service"
 
-[tracing]
-  serviceName = "{{ traefik_id }}"
-  [tracing.jaeger.collector]
-    endpoint = "http://{{ shared_service_kube_jaeger_collector_hostname | default('127.0.0.1') }}:80/api/traces"
+#[tracing]
+#  serviceName = "{{ traefik_id }}"
+#  [tracing.jaeger.collector]
+#    endpoint = "http://{{ shared_service_kube_jaeger_collector_hostname | default('127.0.0.1') }}:80/api/traces"
 
 [api]
   dashboard = true