From a792a7f9e7f2adf7e5a525a4813264af57dafa8a Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Fri, 26 Nov 2021 13:07:56 +0100 Subject: [PATCH] feat: integrated monitoring updates in smardigo portal --- roles/awx/tasks/awx-config.yml | 6 + .../provisioning/process/simple-connect.bpmn | 525 ++++++++++-------- smardigo/provisioning/roles/roles.json | 21 + .../user-management/user-management.json | 15 - 4 files changed, 321 insertions(+), 246 deletions(-) create mode 100644 smardigo/provisioning/roles/roles.json delete mode 100644 smardigo/provisioning/user-management/user-management.json diff --git a/roles/awx/tasks/awx-config.yml b/roles/awx/tasks/awx-config.yml index 080ba31..ad79e0a 100644 --- a/roles/awx/tasks/awx-config.yml +++ b/roles/awx/tasks/awx-config.yml @@ -656,6 +656,12 @@ #playbook_file: "remove-service.yml", credentials: "{{ job_templates_credentials }}" } + - { + name: "update-monitoring", + #description: "update-monitoring", + #playbook_file: "update-monitoring.yml", + credentials: "{{ job_templates_credentials }}" + } loop_control: loop_var: job tags: diff --git a/smardigo/provisioning/process/simple-connect.bpmn b/smardigo/provisioning/process/simple-connect.bpmn index 106b4fe..bd45501 100644 --- a/smardigo/provisioning/process/simple-connect.bpmn +++ b/smardigo/provisioning/process/simple-connect.bpmn @@ -1,5 +1,5 @@ - + @@ -19,8 +19,7 @@ - - + @@ -73,40 +72,10 @@ Flow_0pvr263 Flow_1f0iyrk - - - - ${1} - ${6} - - - Flow_0bzl5jh - Flow_11ki58f - - - - - ${40} - Service wird gestartet - - - Flow_1myfmc6 - Flow_0bzl5jh - Flow_0l51s9z Flow_1myfmc6 - - - - ${50} - Service gestartet - - - Flow_1u7vy0j - Flow_15fkmn4 - @@ -399,37 +368,35 @@ Variables.userId(authenticatedUserId) - + + + + + - - import de.tolina.connect.common.variable.Variables -def authenticatedUserId = users.currentUserId() -Variables.userId(authenticatedUserId) - + ${40} + Service wird gestartet - Flow_0yh3rtc - Flow_090j3ro - - - + Flow_1myfmc6 + Flow_0bzl5jh + + + + + ${1} + ${7} + + + Flow_0bzl5jh + Flow_11ki58f + Flow_090j3ro Flow_0fyo5ev Flow_0oafsaw - - - - - - - - - Flow_0oafsaw - Flow_0mfrm68 - Flow_0mfrm68 @@ -443,12 +410,11 @@ Variables.userId(authenticatedUserId) Flow_0fyo5ev Flow_14gp1tg - ${1} - ${5} + ${6} Flow_14gp1tg @@ -506,33 +472,37 @@ Variables.userId(authenticatedUserId) Flow_14qi17c Flow_0utt18n - - + + + + - - - Flow_13do7kt - - - + + + + + + + + + Flow_0oafsaw + Flow_0mfrm68 + + - ${70} - Service gelöscht + + import de.tolina.connect.common.variable.Variables +def authenticatedUserId = users.currentUserId() +Variables.userId(authenticatedUserId) + - Flow_0kli6wa - Flow_13do7kt - - - Flow_15fkmn4 - Flow_0yh3rtc - Flow_1c2a31w - - - + Flow_0yh3rtc + Flow_090j3ro + Flow_1c2a31w @@ -597,14 +567,14 @@ Variables.userId(authenticatedUserId) Service gestartet - Flow_1c6reic + Flow_1mklq12 Flow_17gszoo ${1} - ${5} + ${6} Flow_18y954i @@ -626,7 +596,7 @@ Variables.userId(authenticatedUserId) Flow_1lt30rz - + @@ -634,6 +604,20 @@ Variables.userId(authenticatedUserId) + + + + + + + + ${progress_current + 1} + + + Flow_1c6reic + Flow_1mklq12 + + @@ -674,16 +658,74 @@ Keycloak Realm mit Administrator Account - ?connect-wordpress + + Flow_15fkmn4 + Flow_0yh3rtc + Flow_1c2a31w + + + + + + + + + ${progress_current + 1} + + + Flow_1u7vy0j + Flow_0n5twpx + + + + + + ${50} + Service gestartet + + + Flow_0n5twpx + Flow_15fkmn4 + + + Flow_13do7kt + + + + + + ${70} + Service gelöscht + + + Flow_17g4mcr + Flow_13do7kt + + + + + + + + + + ${progress_current + 1} + + + Flow_0kli6wa + Flow_17g4mcr + + Flow_019b5ec + Flow_019b5ec - + ${vorgang_status == 30} - Shared Service Server bei Hetzner erstellen @@ -736,9 +778,6 @@ Keycloak Realm mit Administrator Account - Clients entfernen - - - Shared Service Datenbanken löschen @@ -755,6 +794,9 @@ Server bei Hetzner löschen - Provisioning + + + @@ -867,55 +909,67 @@ Server bei Hetzner löschen - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + + + + + + + + + + + + + - - + + - - + + @@ -1003,11 +1057,7 @@ Server bei Hetzner löschen - - - - - + @@ -1030,27 +1080,27 @@ Server bei Hetzner löschen - - + + - + - + - + - - + + @@ -1072,24 +1122,9 @@ Server bei Hetzner löschen - - - - - - - - - - - - - - - @@ -1276,159 +1311,187 @@ Server bei Hetzner löschen - - + + + + + - - + + - - + + - + - + - + - + - + - + - + - - - - + - - - - - + + - - + + - + + + + + - - + + - - + + - + - - + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1443,21 +1506,21 @@ Server bei Hetzner löschen - + - + - + - + - - + + - + @@ -1500,21 +1563,21 @@ Server bei Hetzner löschen + + + + - - + + - - + + - - - - - - + + diff --git a/smardigo/provisioning/roles/roles.json b/smardigo/provisioning/roles/roles.json new file mode 100644 index 0000000..5ea96bb --- /dev/null +++ b/smardigo/provisioning/roles/roles.json @@ -0,0 +1,21 @@ +{ + "name" : "roles", + "configKey" : "roles", + "configType" : "roles", + "roles" : [ { + "id" : "user", + "name" : "User" + }, + { + "id" : "head", + "name" : "Head" + }, + { + "id" : "maintainer", + "name" : "Maintainer" + }, + { + "id" : "administrator", + "name" : "Administrator" + } ] +} diff --git a/smardigo/provisioning/user-management/user-management.json b/smardigo/provisioning/user-management/user-management.json deleted file mode 100644 index 9b84976..0000000 --- a/smardigo/provisioning/user-management/user-management.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "groups" : [ { - "id" : "user", - "name" : "User" - }, { - "id" : "head", - "name" : "Head" - }, { - "id" : "maintainer", - "name" : "Maintainer" - }, { - "id" : "administrator", - "name" : "Administrator" - } ] -} \ No newline at end of file