diff --git a/README.md b/README.md index 90936aa318..063a913353 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ work closely with other to ensure that the downtime is properly scheduled: - https://status.fedoraproject.org is updated (see https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/status-fedora/) Applications on critical path: pagure, mirrormanager, toddlers, bodhi, noggin, mdapi, rpmautospec, -pagure-dist-git, monitor-gating, mirror_from_pagure, fedora-messaging, dist-git, PDC/FPDC, FMN, sigul +pagure-dist-git, mirror_from_pagure, fedora-messaging, dist-git, PDC/FPDC, FMN, sigul robosignatory, tag2distrepo, ci-resultsdb-listener, stylo, mirrorlist resultsdb, Nagios, koschei, wiki / mediawiki, wiki / moin, waiverdb, greenwave, ODCS, Mailman3 / HK, mailman 2, OSBS, pungi, koji, MBS, diff --git a/playbooks/manual/noggin-deployment/uninstall_ipa_client.yml b/playbooks/manual/noggin-deployment/uninstall_ipa_client.yml index 2ecf178c0e..11e4584713 100644 --- a/playbooks/manual/noggin-deployment/uninstall_ipa_client.yml +++ b/playbooks/manual/noggin-deployment/uninstall_ipa_client.yml @@ -45,9 +45,6 @@ - app: koschei secret_name: keytab key: krb5.keytab - - app: monitor-gating - key: monitor-gating-keytab - secret_name: monitor-gating-keytab - app: simple-koji-ci key: simple-koji-ci-keytab secret_name: simple-koji-ci-keytab diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml deleted file mode 100644 index 34dcea609c..0000000000 --- a/playbooks/openshift-apps/monitor_gating.yml +++ /dev/null @@ -1,113 +0,0 @@ ---- -- name: Make the app be real - hosts: os_control_stg[0]:os_control - user: root - gather_facts: false - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - vars: - - ocp4: true - - roles: - - role: openshift/project - project_app: monitor-gating - project_description: Monitor the packager and gating workflow - project_appowners: - - nphilipp - - zlopez - - patrikp - - - role: rabbit/user - user_name: "monitor-gating{{ env_suffix }}" - user_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.monitor-gating\..* - - - role: openshift/keytab - keytab_app: monitor-gating - keytab_key: monitor-gating-keytab - keytab_secret_name: monitor-gating-keytab - keytab_service: packagerbot - - - role: openshift/secret-file - secret_file_app: monitor-gating - secret_file_secret_name: monitor-gating-fedora-messaging-key - secret_file_key: monitor-gating.key - secret_file_privatefile: "rabbitmq/{{env}}/pki/private/monitor-gating{{env_suffix}}.key" - - - role: openshift/secret-file - secret_file_app: monitor-gating - secret_file_secret_name: monitor-gating-fedora-messaging-crt - secret_file_key: monitor-gating.crt - secret_file_privatefile: "rabbitmq/{{env}}/pki/issued/monitor-gating{{env_suffix}}.crt" - - - role: openshift/secret-file - secret_file_app: monitor-gating - secret_file_secret_name: monitor-gating-fedora-messaging-ca - secret_file_key: monitor-gating.ca - secret_file_privatefile: "rabbitmq/{{env}}/pki/ca.crt" - - - role: openshift/object - object_app: monitor-gating - object_template: imagestream.yml.j2 - object_objectname: imagestream.yml - - - role: openshift/object - object_app: monitor-gating - object_template: buildconfig.yml.j2 - object_objectname: buildconfig.yml - - - role: openshift/object - object_app: monitor-gating - object_template: secret.yml.j2 - object_objectname: secret.yml - - - role: openshift/object - object_app: monitor-gating - object_template: configmap.yml.j2 - object_objectname: configmap.yml - - - role: openshift/secret-file - secret_file_app: monitor-gating - secret_file_secret_name: monitor-gating-ssh - secret_file_key: id_rsa - secret_file_privatefile: "git-ssh/monitor_gating" - - - role: openshift/object - object_app: monitor-gating - object_template: deploymentconfig.yml.j2 - object_objectname: deploymentconfig.yml - - - role: openshift/start-build - start_build_app: monitor-gating - start_build_buildname: monitor-gating-build - start_build_objectname: monitor-gating-build - tags: - - never - - build - - - role: openshift/object - object_app: monitor-gating - object_template: dashboard_config.yml.j2 - object_objectname: dashboard_config.yml - - - role: openshift/object - object_app: monitor-gating - object_template: dashboard_configmap.yml.j2 - object_objectname: dashboard_configmap.yml - - - role: openshift/object - object_app: monitor-gating - object_template: dashboard_route.yml.j2 - object_objectname: dashboard_route.yml - - - role: openshift/object - object_app: monitor-gating - object_template: dashboard_serviceaccount.yml.j2 - object_objectname: dashboard_serviceaccount.yml - - - role: openshift/object - object_app: monitor-gating - object_template: dashboard_deploymentconfig.yml.j2 - object_objectname: dashboard_deploymentconfig.yml diff --git a/roles/openshift-apps/firmitas/templates/certlist.yml.j2 b/roles/openshift-apps/firmitas/templates/certlist.yml.j2 index 1aa6f1ded9..8d506ee8bd 100644 --- a/roles/openshift-apps/firmitas/templates/certlist.yml.j2 +++ b/roles/openshift-apps/firmitas/templates/certlist.yml.j2 @@ -703,23 +703,7 @@ mirrormanager.stg: time: null path: mirrormanager.stg.crt user: firmitas-automata -monitor-gating.stg: - certstat: - cstarted: true - cstopped: false - daystobt: -427 - daystodd: 398 - issuauth: RabbitMQ STAGING CA - serialno: 139026373712439409379745863991766899798 - stopdate: 2025-11-10 09:21:07 - strtdate: 2023-08-08 09:21:07 - notistat: - done: false - link: null - time: null - path: monitor-gating.stg.crt - user: firmitas-automata -mts.stg: +ts.stg: certstat: cstarted: true cstopped: false diff --git a/roles/openshift-apps/monitor-gating/templates/buildconfig.yml.j2 b/roles/openshift-apps/monitor-gating/templates/buildconfig.yml.j2 deleted file mode 100644 index 984edcdb92..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/buildconfig.yml.j2 +++ /dev/null @@ -1,26 +0,0 @@ ---- -apiVersion: build.openshift.io/v1 -kind: BuildConfig -metadata: - name: monitor-gating-build - labels: - environment: "monitor-gating" -spec: - source: - git: -{% if env == 'staging' %} - uri: https://pagure.io/fedora-ci/monitor-gating.git - ref: "staging" -{% else %} - uri: https://pagure.io/fedora-ci/monitor-gating.git - ref: "production" -{% endif %} - strategy: - type: Docker - triggers: - - type: ConfigChange - - type: ImageChange - output: - to: - kind: ImageStreamTag - name: monitor-gating:latest diff --git a/roles/openshift-apps/monitor-gating/templates/config.toml b/roles/openshift-apps/monitor-gating/templates/config.toml deleted file mode 100644 index c51c9ec949..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/config.toml +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration for fedora-messaging. This file is in the TOML format. -# For complete details on all configuration options, see the documentation. - -amqp_url = "amqps://monitor-gating{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" - -{% if env == "staging" %} -topic_prefix = "org.fedoraproject.stg" -{% else %} -topic_prefix = "org.fedoraproject.prod" -{% endif %} - -[tls] -ca_cert = "/etc/pki/rabbitmq/ca/monitor-gating.ca" -keyfile = "/etc/pki/rabbitmq/key/monitor-gating.key" -certfile = "/etc/pki/rabbitmq/crt/monitor-gating.crt" diff --git a/roles/openshift-apps/monitor-gating/templates/configmap.yml.j2 b/roles/openshift-apps/monitor-gating/templates/configmap.yml.j2 deleted file mode 100644 index 4c4d568f2a..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/configmap.yml.j2 +++ /dev/null @@ -1,11 +0,0 @@ -{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: fedora-messaging-configmap - labels: - app: monitor-gating -data: - config.toml: |- - {{ load_file('config.toml') | indent }} diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_anitya.json.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_anitya.json.j2 deleted file mode 100644 index 4580515884..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_anitya.json.j2 +++ /dev/null @@ -1,282 +0,0 @@ -{ - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": "-- Grafana --", - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "type": "dashboard" - } - ] - }, - "editable": true, - "gnetId": null, - "graphTooltip": 0, - "id": 2, - "links": [], - "panels": [ - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Datanommer", - "description": "", - "fieldConfig": { - "defaults": { - "custom": {} - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 0 - }, - "hiddenSeries": false, - "id": 6, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.2.1", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "format": "time_series", - "group": [], - "metricColumn": "none", - "rawQuery": true, - "rawSql": "SELECT\n date(\"timestamp\") AS time,\n count(*)\nFROM\n messages\nWHERE\n topic like '%project.add%' AND\n $__timeFilter(\"timestamp\")\ngroup by\n time", - "refId": "A", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "column" - } - ] - ], - "timeColumn": "time", - "where": [ - { - "name": "$__timeFilter", - "params": [], - "type": "macro" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "New projects per day", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Datanommer", - "fieldConfig": { - "defaults": { - "custom": {}, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 8 - }, - "hiddenSeries": false, - "id": 4, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.2.1", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "format": "time_series", - "group": [], - "metricColumn": "none", - "rawQuery": true, - "rawSql": "SELECT\n date(\"timestamp\") AS time,\n count(*)\nFROM\n messages\nWHERE\n topic like '%version.update%' AND\n $__timeFilter(\"timestamp\")\ngroup by\n time", - "refId": "A", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "column" - } - ] - ], - "timeColumn": "time", - "where": [ - { - "name": "$__timeFilter", - "params": [], - "type": "macro" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Updates per day", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - } - ], - "schemaVersion": 26, - "style": "dark", - "tags": [], - "templating": { - "list": [] - }, - "time": { - "from": "now-7d", - "to": "now" - }, - "timepicker": {}, - "timezone": "", - "title": "Anitya", - "uid": "8Zi9LU5Mz", - "version": 5 - } \ No newline at end of file diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_config.yml.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_config.yml.j2 deleted file mode 100644 index de19ab1f85..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_config.yml.j2 +++ /dev/null @@ -1,13 +0,0 @@ -{%- macro load_file(filename) %}{% include filename %}{%- endmacro -%} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-dashboards - labels: - app: monitor-dashboard -data: - dashboard_anitya.json: |- - {{ load_file('dashboard_anitya.json.j2') | indent(6) }} - dashboard_fedora_coreos_updates.json: |- - {{ load_file('dashboard_fedora_coreos_updates.json.j2') | indent(6) }} diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml.j2 deleted file mode 100644 index 18d26c4b4f..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_configmap.yml.j2 +++ /dev/null @@ -1,26 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: grafana-datasources - labels: - app: monitor-dashboard -data: - datasource.yml: |- - apiVersion: 1 - datasources: - - name: Datanommer - type: postgres - url: db-datanommer02.iad2.fedoraproject.org:5432 - user: datanommer_ro - secureJsonData: - password: {{ datanommer_ro_password }} - jsonData: - database: datanommer - default: true - sslmode: "disable" # disable/require/verify-ca/verify-full - maxOpenConns: 0 # Grafana v5.4+ - maxIdleConns: 2 # Grafana v5.4+ - connMaxLifetime: 14400 # Grafana v5.4+ - postgresVersion: 1200 # 903=9.3, 904=9.4, 905=9.5, 906=9.6, 1000=10 - timescaledb: true diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml.j2 deleted file mode 100644 index 9143ed8688..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_deploymentconfig.yml.j2 +++ /dev/null @@ -1,83 +0,0 @@ ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - labels: - app: monitor-dashboard - name: monitor-dashboard -spec: - replicas: 1 - template: - metadata: - labels: - app: monitor-dashboard - deploymentconfig: monitor-dashboard - spec: - containers: - - args: - - "-provider=openshift" - - "-openshift-service-account=monitor-dashboard" - - "-upstream=http://localhost:3000" - - "-client-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token" - - "-cookie-secret=9876543210" - - "-tls-cert=/etc/tls/private/tls.crt" - - "-tls-key=/etc/tls/private/tls.key" - - "-pass-basic-auth=false" - - "-skip-auth-regex=(public|api/snapshots/.+|dashboard/snapshot/.+)" - image: registry.hub.docker.com/openshift/oauth-proxy:latest - name: oauth-proxy - ports: - - containerPort: 8443 - volumeMounts: - - mountPath: /etc/tls/private - name: grafana-tls - - env: - - name: GF_INSTALL_PLUGINS - value: "grafana-clock-panel,simpod-json-datasource,grafana-googlesheets-datasource" - - name: GF_AUTH_BASIC_ENABLED - value: 'true' - - name: GF_AUTH_PROXY_ENABLED - value: 'true' - - name: GF_AUTH_PROXY_HEADER_NAME - value: X-Forwarded-User - - name: GF_AUTH_PROXY_HEADER_PROPERTY - value: username - - name: GF_AUTH_PROXY_AUTO_SIGN_UP - value: 'true' - - name: GF_AUTH_DISABLE_LOGIN_FORM - value: 'false' - - name: GF_SECURITY_ADMIN_PASSWORD - value: 'nbusr123' - - name: GF_SECURITY_ADMIN_USER - value: 'admin' - - name: GF_USERS_ALLOW_SIGN_UP - value: 'false' - - name: 'GF_USERS_AUTO_ASSIGN_ORG_ROLE' - value: 'Admin' - - name: 'V' - value: '17' - image: registry.hub.docker.com/grafana/grafana:latest - name: dashboard - ports: - - containerPort: 3000 - volumeMounts: - - mountPath: /etc/grafana/provisioning/datasources - name: grafana-datasources - - mountPath: /var/lib/grafana/dashboards - name: grafana-dashboards - - mountPath: /etc/grafana/provisioning/dashboards - name: grafana-dashboards-provision - serviceAccountName: monitor-dashboard - volumes: - - name: grafana-tls - secret: - secretName: grafana-tls - - configMap: - name: grafana-datasources - name: grafana-datasources - - configMap: - name: grafana-dashboards - name: grafana-dashboards - - configMap: - name: grafana-dashboards-provision - name: grafana-dashboards-provision diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_fedora_coreos_updates.json.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_fedora_coreos_updates.json.j2 deleted file mode 100644 index a354ccb4b3..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_fedora_coreos_updates.json.j2 +++ /dev/null @@ -1,497 +0,0 @@ -{ - "__inputs": [ ], - "__requires": [ ], - "annotations": { - "list": [ ] - }, - "editable": false, - "gnetId": null, - "graphTooltip": 0, - "hideControls": false, - "id": null, - "links": [ ], - "refresh": "", - "rows": [ - { - "collapse": false, - "collapsed": false, - "panels": [ - { - "aliasColors": { }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { }, - "id": 2, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sideWidth": null, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [ ], - "nullPointMode": "null", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [ ], - "spaceLength": 10, - "span": 6, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum by(os_version) (zincati_identity_os_info)", - "format": "time_series", - "intervalFactor": 2, - "legendFormat":{{ '"{{os_version}}"' }}, - "refId": "A" - } - ], - "thresholds": [ ], - "timeFrom": null, - "timeShift": null, - "title": "OS versions", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [ ] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - } - ] - }, - { - "aliasColors": { }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { }, - "id": 3, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sideWidth": null, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [ ], - "nullPointMode": "null", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [ ], - "spaceLength": 10, - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "zincati_identity_rollout_wariness != 0", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": {{ '"{{instance}}"' }}, - "refId": "A" - } - ], - "thresholds": [ ], - "timeFrom": null, - "timeShift": null, - "title": "Static rollout wariness", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [ ] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - } - ] - } - ], - "repeat": null, - "repeatIteration": null, - "repeatRowId": null, - "showTitle": true, - "title": "Agent identity", - "titleSize": "h6", - "type": "row" - }, - { - "collapse": false, - "collapsed": false, - "panels": [ - { - "aliasColors": { }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { }, - "id": 4, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sideWidth": null, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [ ], - "nullPointMode": "null", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [ ], - "spaceLength": 10, - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "quantile_over_time(0.99, (time() - zincati_update_agent_last_refresh_timestamp)[15m:])", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": {{ '"{{instance}}"' }}, - "refId": "A" - } - ], - "thresholds": [ ], - "timeFrom": null, - "timeShift": null, - "title": "Agent refresh period (p99)", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [ ] - }, - "yaxes": [ - { - "format": "s", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - } - ] - }, - { - "aliasColors": { }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { }, - "id": 5, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sideWidth": null, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [ ], - "nullPointMode": "null", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [ ], - "spaceLength": 10, - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (kind) (rate(zincati_cincinnati_update_checks_errors_total[5m]))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": {{'"kind: {{kind}}"'}}, - "refId": "A" - } - ], - "thresholds": [ ], - "timeFrom": null, - "timeShift": null, - "title": "Cincinnati client error-rate", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [ ] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - } - ] - }, - { - "aliasColors": { }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "$datasource", - "fill": 1, - "gridPos": { }, - "id": 6, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sideWidth": null, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [ ], - "nullPointMode": "null", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [ ], - "spaceLength": 10, - "span": 6, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (os_version) ((zincati_cincinnati_booted_release_is_deadend) + on (instance) group_left(os_version) (0*zincati_identity_os_info))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": {{ '"{{os_version}}"' }}, - "refId": "A" - } - ], - "thresholds": [ ], - "timeFrom": null, - "timeShift": null, - "title": "Deadends detected", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [ ] - }, - "yaxes": [ - { - "decimals": 0, - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - } - ] - } - ], - "repeat": null, - "repeatIteration": null, - "repeatRowId": null, - "showTitle": true, - "title": "Agent details", - "titleSize": "h6", - "type": "row" - } - ], - "schemaVersion": 14, - "style": "dark", - "tags": [ ], - "templating": { - "list": [ - { - "current": { - "text": "Prometheus", - "value": "Prometheus" - }, - "hide": 0, - "label": null, - "name": "datasource", - "options": [ ], - "query": "prometheus", - "refresh": 1, - "regex": "", - "type": "datasource" - } - ] - }, - "time": { - "from": "now-7d", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "timezone": "browser", - "title": "Fedora CoreOS updates (Zincati)", - "version": 0 - } \ No newline at end of file diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_provision_config.yml.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_provision_config.yml.j2 deleted file mode 100644 index 8f29dc1dc6..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_provision_config.yml.j2 +++ /dev/null @@ -1,31 +0,0 @@ ---- -apiVersion: v1 -data: - dashboards.yml: | - apiVersion: 1 - - providers: - # an unique provider name. Required - - name: 'Preset Dashboards' - # Org id. Default to 1 - orgId: 1 - # name of the dashboard folder. - folder: '' - # folder UID. will be automatically generated if not specified - folderUid: '' - # provider type. Default to 'file' - type: file - # disable dashboard deletion - disableDeletion: false - # how often Grafana will scan for changed dashboards - updateIntervalSeconds: 10 - # allow updating provisioned dashboards from the UI - allowUiUpdates: false - options: - # path to dashboard files on disk. Required when using the 'file' type - path: /var/lib/grafana/dashboards - # use folder names from filesystem to create folders in Grafana - foldersFromFilesStructure: true -kind: ConfigMap -metadata: - name: grafana-dashboards-provision diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_route.yml.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_route.yml.j2 deleted file mode 100644 index 56572438d4..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_route.yml.j2 +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: monitor-dashboard - labels: - app: monitor-dashboard -spec: - # host: waiverdb.stg.fedoraproject.org - port: - targetPort: web - to: - kind: Service - name: monitor-dashboard - tls: - termination: reencrypt - insecureEdgeTerminationPolicy: Redirect diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_service.yml.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_service.yml.j2 deleted file mode 100644 index d7c3a5dca8..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_service.yml.j2 +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: monitor-dashboard - labels: - app: monitor-dashboard - annotations: - service.alpha.openshift.io/serving-cert-secret-name: grafana-tls -spec: - selector: - app: monitor-dashboard - ports: - - name: web - port: 8443 - targetPort: 8443 diff --git a/roles/openshift-apps/monitor-gating/templates/dashboard_serviceaccount.yml.j2 b/roles/openshift-apps/monitor-gating/templates/dashboard_serviceaccount.yml.j2 deleted file mode 100644 index d57fab2a58..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/dashboard_serviceaccount.yml.j2 +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: monitor-dashboard - annotations: - serviceaccounts.openshift.io/oauth-redirectreference.primary: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"monitor-dashboard"}}' diff --git a/roles/openshift-apps/monitor-gating/templates/deploymentconfig.yml.j2 b/roles/openshift-apps/monitor-gating/templates/deploymentconfig.yml.j2 deleted file mode 100644 index 7455eb4d9a..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/deploymentconfig.yml.j2 +++ /dev/null @@ -1,95 +0,0 @@ ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - labels: - app: monitor-gating - name: monitor-gating -spec: - replicas: 1 - selector: - app: monitor-gating - deploymentconfig: monitor-gating - strategy: - type: Recreate - template: - metadata: - labels: - app: monitor-gating - deploymentconfig: monitor-gating - spec: - hostAliases: - - hostnames: - - apps.stg.fedoraproject.org - ip: 10.3.166.74 - containers: - - name: monitor-gating - image: monitor-gating:latest - resources: {} - env: - - name: KRB5_CONFIG - value: /opt/config/krb5.conf - - name: KRB5_CLIENT_KTNAME - value: /etc/keytabs/monitor-gating-keytab - - name: OPENSHIFT - value: "True" -{% if env != "staging" %} - - name: PRODUCTION - value: "True" -{% endif %} - volumeMounts: - - name: keytab-volume - mountPath: /etc/keytabs - readOnly: true - - name: monitor-gating-secret-volume - mountPath: /opt/config/ - readOnly: true - - name: monitor-gating-ssh-volume - mountPath: /opt/ssh/ - readOnly: true - - name: fedora-messaging-config-volume - mountPath: /etc/fedora-messaging - readOnly: true - - name: fedora-messaging-ca-volume - mountPath: /etc/pki/rabbitmq/ca - readOnly: true - - name: fedora-messaging-crt-volume - mountPath: /etc/pki/rabbitmq/crt - readOnly: true - - name: fedora-messaging-key-volume - mountPath: /etc/pki/rabbitmq/key - readOnly: true - volumes: - - name: keytab-volume - secret: - secretName: monitor-gating-keytab - - name: monitor-gating-secret-volume - secret: - secretName: monitor-gating-secret - defaultMode: 0660 - - name: monitor-gating-ssh-volume - secret: - secretName: monitor-gating-ssh - defaultMode: 0660 - - name: fedora-messaging-config-volume - configMap: - name: fedora-messaging-configmap - - name: fedora-messaging-ca-volume - secret: - secretName: monitor-gating-fedora-messaging-ca - - name: fedora-messaging-crt-volume - secret: - secretName: monitor-gating-fedora-messaging-crt - - name: fedora-messaging-key-volume - secret: - secretName: monitor-gating-fedora-messaging-key - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - monitor-gating - from: - kind: ImageStreamTag - name: monitor-gating:latest diff --git a/roles/openshift-apps/monitor-gating/templates/imagestream.yml.j2 b/roles/openshift-apps/monitor-gating/templates/imagestream.yml.j2 deleted file mode 100644 index ae4e06d9b4..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/imagestream.yml.j2 +++ /dev/null @@ -1,5 +0,0 @@ ---- -apiVersion: image.openshift.io/v1 -kind: ImageStream -metadata: - name: "monitor-gating" diff --git a/roles/openshift-apps/monitor-gating/templates/monitor_gating.cfg b/roles/openshift-apps/monitor-gating/templates/monitor_gating.cfg deleted file mode 100644 index c3930b0295..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/monitor_gating.cfg +++ /dev/null @@ -1,44 +0,0 @@ -{% if env == 'staging' %} -fedpkg = "fedpkg-stage" -resultsdb = "https://resultsdb.stg.fedoraproject.org/api/v2.0/results" -resultsdb_rdu = "http://resultsdb.ci.centos.org/resultsdb_api/api/v2.0/results" -datagrepper = "https://apps.stg.fedoraproject.org/datagrepper/raw" -pagure_dist_git = "https://src.stg.fedoraproject.org/" -distgit_host = "pkgs.stg.fedoraproject.org" -koji_hub = "https://koji.stg.fedoraproject.org/kojihub" -bodhi = "https://bodhi.stg.fedoraproject.org" -bodhi-cli = "bodhi" - -_env = "stg" -_ci_env = "stage" -fas_username = "packagerbot" -namespace = "rpms" -name_single = "dummy-test-package-gloster" -name_multi_1 = "dummy-test-package-crested" -name_multi_2 = "dummy-test-package-rubino" -branch = "rawhide" -pagure_token = "{{ monitor_gating_pagure_token_stg }}" -koji_end_tag = "f36" - -{% else %} -fedpkg = "fedpkg" -resultsdb = "https://resultsdb.fedoraproject.org/api/v2.0/results" -resultsdb_rdu = "http://resultsdb.ci.centos.org/resultsdb_api/api/v2.0/results" -datagrepper = "https://apps.fedoraproject.org/datagrepper/raw" -pagure_dist_git = "https://src.fedoraproject.org/" -distgit_host = "pkgs.fedoraproject.org" -koji_hub = "https://koji.fedoraproject.org/kojihub" -bodhi = "https://bodhi.fedoraproject.org" -bodhi-cli = "bodhi" -koji_end_tag = "f36" - -_env = "prod" -_ci_env = "prod" -fas_username = "packagerbot" -namespace = "rpms" -name_single = "dummy-test-package-gloster" -name_multi_1 = "dummy-test-package-crested" -name_multi_2 = "dummy-test-package-rubino" -branch = "rawhide" -pagure_token = "{{ monitor_gating_pagure_token_prod }}" -{% endif %} diff --git a/roles/openshift-apps/monitor-gating/templates/runner.cfg b/roles/openshift-apps/monitor-gating/templates/runner.cfg deleted file mode 100644 index 2787aa2e32..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/runner.cfg +++ /dev/null @@ -1,53 +0,0 @@ -# Time between two runs in second -delay = 3600 - -# Time between two blocked runs in second -delay_when_failing = 43200 - -# Setting the below to true will cancel the scheduler. This means the tests will only run once. -# NOTE: should never be true in production. -single_run = false - -# blocker issue tags, issue has to have all of them -{% if env == 'staging' %} -kb_principal = "packagerbot/os-control01.stg.iad2.fedoraproject.org@STG.FEDORAPROJECT.ORG" -kb_keytab_file = "/etc/keytabs/monitor-gating-keytab" -{% else %} -kb_principal = "packagerbot/os-control01.iad2.fedoraproject.org@FEDORAPROJECT.ORG" -kb_keytab_file = "/etc/keytabs/monitor-gating-keytab" -{% endif %} - - -# CLI arguments to give to the script testing the single build gating workflow -workflow_single_gating_args = "--conf /opt/config/monitor_gating.cfg --auto-update --no-pr" - -# CLI arguments to give to the script testing the multi builds gating workflow -# Disabling this because of silent failures -workflow_multi_gating_args = "" - -# Project whose issue will slow down the subsequent runs (delay defined -# above). -pagure_blocking_project = "packager-workflow" -# Project against which failed runs report their failure. -pagure_report_project = "packager-workflow" - -# The fedpkg command to call to clean up the dangling side-tags -{% if env == 'staging' %} -fedpkg = "fedpkg-stage" - -# blocker issue tags, issue has to have all of them. -blocker_tags = ['packager_workflow_blocker', 'staging'] -pagure_api_token = "{{ monitor_gating_pagure_api_token_workflow_stg }}" -env = "staging" - -{% else %} -env = "prod" -fedpkg = "fedpkg" - -# blocker issue tags, issue has to have all of them. -blocker_tags = ['packager_workflow_blocker'] - -pagure_api_token = "{{ monitor_gating_pagure_api_token_workflow_prod }}" - -{% endif %} - diff --git a/roles/openshift-apps/monitor-gating/templates/secret.yml.j2 b/roles/openshift-apps/monitor-gating/templates/secret.yml.j2 deleted file mode 100644 index 78ab7e9434..0000000000 --- a/roles/openshift-apps/monitor-gating/templates/secret.yml.j2 +++ /dev/null @@ -1,14 +0,0 @@ -{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} -apiVersion: v1 -kind: Secret -metadata: - name: monitor-gating-secret - labels: - app: monitor-gating -stringData: - monitor_gating.cfg: |- - {{ load_file('monitor_gating.cfg') | indent }} - runner.cfg: |- - {{ load_file('runner.cfg') | indent }} - krb5.conf: | - {{ lookup('template', roles_path + '/base/templates/krb5.conf.j2') | indent }}