From 9919985e3d94b191dc7908c82e6506545dcf8c79 Mon Sep 17 00:00:00 2001 From: "Ketelsen, Sven" Date: Fri, 23 Sep 2022 13:27:32 +0000 Subject: [PATCH] DEV-593 updated versions --- group_vars/all/versions.yml | 29 +++++++++++++++++++ group_vars/management/plain.yml | 2 -- group_vars/stage_dev/plain.yml | 4 --- group_vars/stage_prodnso/plain.yml | 4 --- group_vars/stage_qa/plain.yml | 4 --- roles/connect/vars/main.yml | 2 +- roles/elastic/defaults/main.yaml | 3 -- roles/elastic/vars/main.yml | 4 +-- roles/filebeat/defaults/main.yaml | 1 - roles/filebeat/vars/main.yml | 2 +- roles/gitea/defaults/main.yml | 1 - roles/gitea/vars/main.yml | 2 +- roles/harbor/defaults/main.yml | 2 -- roles/iam/defaults/main.yml | 1 - roles/iam/vars/main.yml | 2 +- roles/keycloak/defaults/main.yml | 1 - roles/kibana/defaults/main.yaml | 1 - roles/kibana/vars/main.yml | 2 +- roles/logstash/defaults/main.yaml | 1 - roles/logstash/vars/main.yml | 2 +- roles/management/tasks/connections.yml | 4 +-- roles/metricbeat/defaults/main.yaml | 1 - roles/metricbeat/vars/main.yml | 2 +- roles/node_exporter/defaults/main.yml | 1 - roles/node_exporter/vars/main.yml | 1 - roles/pgadmin4/defaults/main.yml | 1 - roles/pgadmin4/vars/main.yml | 2 +- roles/prometheus/defaults/main.yml | 5 ---- roles/prometheus/vars/main.yml | 8 ++--- roles/traefik/defaults/main.yml | 1 - roles/traefik/vars/main.yml | 2 +- roles/webdav/defaults/main.yaml | 1 - roles/webdav/vars/main.yml | 2 +- .../provisioning/script/ansible-start.groovy | 2 +- .../script/create-awx-paramaters.groovy | 2 +- templates/traefik/traefik.toml.j2 | 8 ++--- 36 files changed, 53 insertions(+), 60 deletions(-) create mode 100644 group_vars/all/versions.yml delete mode 100644 roles/node_exporter/defaults/main.yml delete mode 100644 roles/node_exporter/vars/main.yml diff --git a/group_vars/all/versions.yml b/group_vars/all/versions.yml new file mode 100644 index 0000000..95f3065 --- /dev/null +++ b/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" diff --git a/group_vars/management/plain.yml b/group_vars/management/plain.yml index b0e5681..90fa7dd 100644 --- a/group_vars/management/plain.yml +++ b/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 }}" diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml index 4b6e55c..67acf4f 100644 --- a/group_vars/stage_dev/plain.yml +++ b/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" diff --git a/group_vars/stage_prodnso/plain.yml b/group_vars/stage_prodnso/plain.yml index 544e575..db28528 100644 --- a/group_vars/stage_prodnso/plain.yml +++ b/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" diff --git a/group_vars/stage_qa/plain.yml b/group_vars/stage_qa/plain.yml index b53a187..799e67d 100644 --- a/group_vars/stage_qa/plain.yml +++ b/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" diff --git a/roles/connect/vars/main.yml b/roles/connect/vars/main.yml index 282f295..f7c887e 100644 --- a/roles/connect/vars/main.yml +++ b/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([])) }}", diff --git a/roles/elastic/defaults/main.yaml b/roles/elastic/defaults/main.yaml index 0337214..cd0d567 100644 --- a/roles/elastic/defaults/main.yaml +++ b/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" diff --git a/roles/elastic/vars/main.yml b/roles/elastic/vars/main.yml index 0f9bc63..e208ad1 100644 --- a/roles/elastic/vars/main.yml +++ b/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"', diff --git a/roles/filebeat/defaults/main.yaml b/roles/filebeat/defaults/main.yaml index 986bc34..652ba68 100644 --- a/roles/filebeat/defaults/main.yaml +++ b/roles/filebeat/defaults/main.yaml @@ -1,4 +1,3 @@ --- filebeat_image_name: "docker.elastic.co/beats/filebeat" -filebeat_image_version: "7.16.3" diff --git a/roles/filebeat/vars/main.yml b/roles/filebeat/vars/main.yml index 810e7e4..0fe74fe 100644 --- a/roles/filebeat/vars/main.yml +++ b/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 }}\"", diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index 7c90c53..deede42 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -1,4 +1,3 @@ --- gitea_image_name: "gitea/gitea" -gitea_image_version: "1.15" diff --git a/roles/gitea/vars/main.yml b/roles/gitea/vars/main.yml index 03ab096..a5a2116 100644 --- a/roles/gitea/vars/main.yml +++ b/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([])) }}", diff --git a/roles/harbor/defaults/main.yml b/roles/harbor/defaults/main.yml index fdda10c..3b2d53f 100644 --- a/roles/harbor/defaults/main.yml +++ b/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 }}' diff --git a/roles/iam/defaults/main.yml b/roles/iam/defaults/main.yml index ef8c35d..eddc6be 100644 --- a/roles/iam/defaults/main.yml +++ b/roles/iam/defaults/main.yml @@ -1,4 +1,3 @@ --- iam_image_name: '{{ shared_service_harbor_hostname }}/smardigo/iam-app' -iam_image_version: 'latest' diff --git a/roles/iam/vars/main.yml b/roles/iam/vars/main.yml index 09689fe..bf37a59 100644 --- a/roles/iam/vars/main.yml +++ b/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: [ diff --git a/roles/keycloak/defaults/main.yml b/roles/keycloak/defaults/main.yml index c8af49f..07af60c 100644 --- a/roles/keycloak/defaults/main.yml +++ b/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" diff --git a/roles/kibana/defaults/main.yaml b/roles/kibana/defaults/main.yaml index 520b5da..945cc02 100644 --- a/roles/kibana/defaults/main.yaml +++ b/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: diff --git a/roles/kibana/vars/main.yml b/roles/kibana/vars/main.yml index 1d2d002..4efe178 100644 --- a/roles/kibana/vars/main.yml +++ b/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 }}", diff --git a/roles/logstash/defaults/main.yaml b/roles/logstash/defaults/main.yaml index 9b1a218..bf5eeee 100644 --- a/roles/logstash/defaults/main.yaml +++ b/roles/logstash/defaults/main.yaml @@ -1,4 +1,3 @@ --- logstash_image_name: "docker.elastic.co/logstash/logstash" -logstash_image_version: "7.16.3" diff --git a/roles/logstash/vars/main.yml b/roles/logstash/vars/main.yml index f31c8f9..b47a750 100644 --- a/roles/logstash/vars/main.yml +++ b/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\"", diff --git a/roles/management/tasks/connections.yml b/roles/management/tasks/connections.yml index 76b554e..a040fe3 100644 --- a/roles/management/tasks/connections.yml +++ b/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 }}' diff --git a/roles/metricbeat/defaults/main.yaml b/roles/metricbeat/defaults/main.yaml index 5de9568..88543e4 100644 --- a/roles/metricbeat/defaults/main.yaml +++ b/roles/metricbeat/defaults/main.yaml @@ -1,4 +1,3 @@ --- metricbeat_image_name: "docker.elastic.co/beats/metricbeat" -metricbeat_image_version: "7.16.3" diff --git a/roles/metricbeat/vars/main.yml b/roles/metricbeat/vars/main.yml index 5d471ad..528bd98 100644 --- a/roles/metricbeat/vars/main.yml +++ b/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 }}\"", diff --git a/roles/node_exporter/defaults/main.yml b/roles/node_exporter/defaults/main.yml deleted file mode 100644 index ed97d53..0000000 --- a/roles/node_exporter/defaults/main.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/roles/node_exporter/vars/main.yml b/roles/node_exporter/vars/main.yml deleted file mode 100644 index ed97d53..0000000 --- a/roles/node_exporter/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/roles/pgadmin4/defaults/main.yml b/roles/pgadmin4/defaults/main.yml index 944ea09..da6d313 100644 --- a/roles/pgadmin4/defaults/main.yml +++ b/roles/pgadmin4/defaults/main.yml @@ -1,4 +1,3 @@ --- pgadmin4_image_name: "dpage/pgadmin4" -pgadmin4_image_version: "6" diff --git a/roles/pgadmin4/vars/main.yml b/roles/pgadmin4/vars/main.yml index 5b16609..58cdc09 100644 --- a/roles/pgadmin4/vars/main.yml +++ b/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 }}"', diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml index b983ec5..18c00ae 100644 --- a/roles/prometheus/defaults/main.yml +++ b/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" diff --git a/roles/prometheus/vars/main.yml b/roles/prometheus/vars/main.yml index 5caa4c6..5ebad3f 100644 --- a/roles/prometheus/vars/main.yml +++ b/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"', ], diff --git a/roles/traefik/defaults/main.yml b/roles/traefik/defaults/main.yml index 5e202c0..5c6e1ae 100644 --- a/roles/traefik/defaults/main.yml +++ b/roles/traefik/defaults/main.yml @@ -1,4 +1,3 @@ --- traefik_image_name: "traefik" -traefik_image_version: "v2.6" diff --git a/roles/traefik/vars/main.yml b/roles/traefik/vars/main.yml index a412b67..9e302a3 100644 --- a/roles/traefik/vars/main.yml +++ b/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 }}"', ], diff --git a/roles/webdav/defaults/main.yaml b/roles/webdav/defaults/main.yaml index 3099499..d7a7fad 100644 --- a/roles/webdav/defaults/main.yaml +++ b/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" diff --git a/roles/webdav/vars/main.yml b/roles/webdav/vars/main.yml index f68807d..d8a12e7 100644 --- a/roles/webdav/vars/main.yml +++ b/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, diff --git a/smardigo/provisioning/script/ansible-start.groovy b/smardigo/provisioning/script/ansible-start.groovy index b134595..9df2c45 100644 --- a/smardigo/provisioning/script/ansible-start.groovy +++ b/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(), diff --git a/smardigo/provisioning/script/create-awx-paramaters.groovy b/smardigo/provisioning/script/create-awx-paramaters.groovy index 847ad8b..f02d681 100644 --- a/smardigo/provisioning/script/create-awx-paramaters.groovy +++ b/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(), diff --git a/templates/traefik/traefik.toml.j2 b/templates/traefik/traefik.toml.j2 index 166d9a7..914cef7 100644 --- a/templates/traefik/traefik.toml.j2 +++ b/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