diff --git a/playbooks/openshift-apps/monitor_dashboard.yml b/playbooks/openshift-apps/monitor_dashboard.yml index b059e13bff..e1852f2e19 100644 --- a/playbooks/openshift-apps/monitor_dashboard.yml +++ b/playbooks/openshift-apps/monitor_dashboard.yml @@ -18,62 +18,62 @@ - nphilipp - asaleh - - role: openshift/object - app: monitor-dashboard - template: configmap.yml - objectname: configmap.yml +# - role: openshift/object +# app: monitor-dashboard +# template: configmap.yml +# objectname: configmap.yml - - role: openshift/object - app: monitor-dashboard - file: notifiers.yaml - objectname: notifiers.yml +# - role: openshift/object +# app: monitor-dashboard +# file: notifiers.yaml +# objectname: notifiers.yml - - role: openshift/object - app: monitor-dashboard - file: dashboard_provision_config.yml - objectname: dashboard_provision_config.yml +# - role: openshift/object +# app: monitor-dashboard +# file: dashboard_provision_config.yml +# objectname: dashboard_provision_config.yml - - role: openshift/object - app: monitor-dashboard - template: dashboard_config.yml - objectname: dashboard_config.yml + #- role: openshift/object + # app: monitor-dashboard + # template: dashboard_config.yml + # objectname: dashboard_config.yml - - role: openshift/object - app: monitor-dashboard - template: buildconfig.yml - objectname: buildconfig.yml +# - role: openshift/object +# app: monitor-dashboard +# template: buildconfig.yml +# objectname: buildconfig.yml - - role: openshift/object - app: monitor-dashboard - file: imagestream.yml - objectname: imagestream.yml +# - role: openshift/object +# app: monitor-dashboard +# file: imagestream.yml +# objectname: imagestream.yml - - role: openshift/object - app: monitor-dashboard - template: datagrepper_configmap.yml - objectname: datagrepper_configmap.yml +# - role: openshift/object +# app: monitor-dashboard +# template: datagrepper_configmap.yml +# objectname: datagrepper_configmap.yml - role: openshift/object app: monitor-dashboard file: service.yml objectname: service.yml - - role: openshift/object - app: monitor-dashboard - file: datagrepper_service.yml - objectname: datagrepper_service.yml +# - role: openshift/object +# app: monitor-dashboard +# file: datagrepper_service.yml +# objectname: datagrepper_service.yml - - role: openshift/object - app: monitor-dashboard - file: postgrest_service.yml - objectname: postgrest_service.yml +# - role: openshift/object +# app: monitor-dashboard +# file: postgrest_service.yml +# objectname: postgrest_service.yml - - role: openshift/object - app: monitor-dashboard - file: prest_service.yml - objectname: prest_service.yml +# - role: openshift/object +# app: monitor-dashboard +# file: prest_service.yml +# objectname: prest_service.yml - role: openshift/object app: monitor-dashboard @@ -86,36 +86,36 @@ file: route.yml objectname: route.yml - - role: openshift/object - app: monitor-dashboard - file: datagrepper_route.yml - objectname: datagrepper_route.yml +# - role: openshift/object +# app: monitor-dashboard +# file: datagrepper_route.yml +# objectname: datagrepper_route.yml - - role: openshift/object - app: monitor-dashboard - file: postgrest_route.yml - objectname: postgrest_route.yml +# - role: openshift/object +# app: monitor-dashboard +# file: postgrest_route.yml +# objectname: postgrest_route.yml - - role: openshift/object - app: monitor-dashboard - file: prest_route.yml - objectname: prest_route.yml +# - role: openshift/object +# app: monitor-dashboard +# file: prest_route.yml +# objectname: prest_route.yml - - role: openshift/object - app: monitor-dashboard - template: postgrest_deploymentconfig.yml - objectname: postgrest_deploymentconfig.yml +# - role: openshift/object +# app: monitor-dashboard +# template: postgrest_deploymentconfig.yml +# objectname: postgrest_deploymentconfig.yml - - role: openshift/object - app: monitor-dashboard - template: prest_deploymentconfig.yml - objectname: prest_deploymentconfig.yml +# - role: openshift/object +# app: monitor-dashboard +# template: prest_deploymentconfig.yml +# objectname: prest_deploymentconfig.yml - - role: openshift/object - app: monitor-dashboard - template: datagrepper_deploymentconfig.yml - objectname: datagrepper_deploymentconfig.yml +# - role: openshift/object +# app: monitor-dashboard +# template: datagrepper_deploymentconfig.yml +# objectname: datagrepper_deploymentconfig.yml - role: openshift/object app: monitor-dashboard diff --git a/roles/openshift-apps/monitor-dashboard/files/route.yml b/roles/openshift-apps/monitor-dashboard/files/route.yml index 5fee49c20e..a00198063c 100644 --- a/roles/openshift-apps/monitor-dashboard/files/route.yml +++ b/roles/openshift-apps/monitor-dashboard/files/route.yml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Route metadata: - name: monitor-dashboard-web + name: monitor-dashboard labels: app: monitor-dashboard spec: diff --git a/roles/openshift-apps/monitor-dashboard/files/service.yml b/roles/openshift-apps/monitor-dashboard/files/service.yml index cba269ed31..fe9b556acd 100644 --- a/roles/openshift-apps/monitor-dashboard/files/service.yml +++ b/roles/openshift-apps/monitor-dashboard/files/service.yml @@ -8,7 +8,7 @@ metadata: service.alpha.openshift.io/serving-cert-secret-name: grafana-tls spec: selector: - app: dashboard + app: monitor-dashboard service: web ports: - name: web diff --git a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml index 9aefd1bfa0..98437d4faf 100644 --- a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml +++ b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml @@ -1,20 +1,21 @@ --- -apiVersion: apps/v1 -kind: Deployment +apiVersion: apps.openshift.io/v1 +kind: DeploymentConfig metadata: - name: dashboard + labels: + app: monitor-dashboard + name: monitor-dashboard spec: replicas: 1 selector: matchLabels: - name: dashboard + app: monitor-dashboard + deploymentconfig: monitor-dashboard template: metadata: labels: - name: dashboard - app: dashboard - service: web - name: dashboard + app: monitor-dashboard + deploymentconfig: monitor-dashboard spec: containers: - args: @@ -33,7 +34,7 @@ spec: - containerPort: 8443 volumeMounts: - mountPath: /etc/tls/private - name: grafana-tls + name: grafana-tls - env: - name: GF_INSTALL_PLUGINS value: "grafana-clock-panel,simpod-json-datasource,grafana-googlesheets-datasource" @@ -63,29 +64,29 @@ spec: name: dashboard ports: - containerPort: 3000 - volumeMounts: - - mountPath: /etc/grafana/provisioning/notifiers - name: grafana-notifiers - - mountPath: /etc/grafana/provisioning/datasources - name: grafana-datasources - - mountPath: /etc/grafana/provisioning/dashboards - name: grafana-dashboards-provision - - mountPath: /var/lib/grafana/dashboards - name: grafana-dashboards +# volumeMounts: +# - mountPath: /etc/grafana/provisioning/notifiers +# name: grafana-notifiers +# - mountPath: /etc/grafana/provisioning/datasources +## name: grafana-datasources +# - mountPath: /etc/grafana/provisioning/dashboards +# name: grafana-dashboards-provision +# - mountPath: /var/lib/grafana/dashboards +# name: grafana-dashboards serviceAccountName: monitor-dashboard-web volumes: - name: grafana-tls secret: secretName: grafana-tls - - configMap: - name: grafana-datasources - name: grafana-datasources - - configMap: - name: grafana-dashboards-provision - name: grafana-dashboards-provision - - configMap: - name: grafana-notifiers - name: grafana-notifiers - - configMap: - name: grafana-dashboards - name: grafana-dashboards \ No newline at end of file +# - configMap: +# name: grafana-datasources +# name: grafana-datasources +# - configMap: +# name: grafana-dashboards-provision +# name: grafana-dashboards-provision +# - configMap: +# name: grafana-notifiers +# name: grafana-notifiers +# - configMap: +# name: grafana-dashboards +# name: grafana-dashboards \ No newline at end of file