From 4f12e332156f7f511807ed4144b649d17d538b97 Mon Sep 17 00:00:00 2001 From: Egid Fertal Date: Tue, 16 Jul 2024 14:04:37 +0200 Subject: [PATCH] Revert "SMAR-2820 changes to service monitor" This reverts commit 951368069234cfba386bd217aad9a32cfe3541ee. --- .vscode/settings.json | 23 ------ egid-multitenant.values.yaml | 91 ----------------------- eu-central-1.values.yaml | 90 ---------------------- staging.values.yaml | 90 ---------------------- templates/metrics/sf-service-monitor.yaml | 2 +- 5 files changed, 1 insertion(+), 295 deletions(-) delete mode 100644 .vscode/settings.json delete mode 100644 egid-multitenant.values.yaml delete mode 100644 eu-central-1.values.yaml delete mode 100644 staging.values.yaml diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 1b628a8..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "peacock.remoteColor": "#071075", - "workbench.colorCustomizations": { - "activityBar.activeBackground": "#0a17a5", - "activityBar.background": "#0a17a5", - "activityBar.foreground": "#e7e7e7", - "activityBar.inactiveForeground": "#e7e7e799", - "activityBarBadge.background": "#d20d1d", - "activityBarBadge.foreground": "#e7e7e7", - "commandCenter.border": "#e7e7e799", - "sash.hoverBorder": "#0a17a5", - "statusBar.background": "#071075", - "statusBar.foreground": "#e7e7e7", - "statusBarItem.hoverBackground": "#0a17a5", - "statusBarItem.remoteBackground": "#071075", - "statusBarItem.remoteForeground": "#e7e7e7", - "titleBar.activeBackground": "#071075", - "titleBar.activeForeground": "#e7e7e7", - "titleBar.inactiveBackground": "#07107599", - "titleBar.inactiveForeground": "#e7e7e799" - }, - "peacock.color": "#007fff" -} \ No newline at end of file diff --git a/egid-multitenant.values.yaml b/egid-multitenant.values.yaml deleted file mode 100644 index c21a139..0000000 --- a/egid-multitenant.values.yaml +++ /dev/null @@ -1,91 +0,0 @@ -"accessController": - "dnsHost": "ac.egid-multitenant.smartfacecloud.com" -"api": - "dnsHost": "noauth-api.egid-multitenant.smartfacecloud.com" - "enabled": true -"authApi": - "dnsHost": "api.egid-multitenant.smartfacecloud.com" - "enabled": true -"autoscaling": - "cron": - "enabled": false - "rmq": - "enabled": true -"configurations": - "apiAuth": - "existingConfigMapName": "auth-config" - "s3": - "existingConfigMapName": "s3-config" -"countlyPublisher": - "clusterName": "egid-multitenant" - "enabled": false -"dbSynchronizationLeader": - "dnsHost": "dbsync.egid-multitenant.smartfacecloud.com" - "enableAuth": true - "enabled": true -"detector": - "resources": - "requests": - "cpu": "100m" -"extractor": - "resources": - "requests": - "cpu": "100m" -"features": - "edgeStreams": - "enabled": false - "multitenancy": - "enabled": true -"graphqlApi": - "dnsHost": "graphql.egid-multitenant.smartfacecloud.com" - "enableAuth": true -"ingress": - "certificateArn": "arn:aws:acm:eu-central-1:291501518763:certificate/6f3b3c17-4e98-420a-86df-aee6fd916638" - "class": "alb" - "includeAlbAnnotations": true -"liveness": - "resources": - "requests": - "cpu": "100m" -"matcher": - "resources": - "requests": - "cpu": "100m" -"metrics": - "enabled": true - "publishAllMetrics": false -"minio": - "enabled": false -"postgresql": - "enabled": false -"rabbitmq": - "auth": - "erlangCookie": "7_nX0>>i-N72wsgyma}C1[WK)>N5]7]5" - "password": "o0Gs.YM.q1WL" - "mqttPublicService": - "enabled": false - "mqttDnsHost": "" -"serviceAccount": - "annotations": - "eks.amazonaws.com/role-arn": "arn:aws:iam::291501518763:role/smartface-egid-egid-multitenant" - "name": "sf-service-account" -"sf-tenant-management": - "api": - "auth": - "existingConfigMap": "tenant-auth-config" - "enabled": false - "apiDnsHost": "" - "enabled": true -"station": - "dnsHost": "egid-multitenant.smartfacecloud.com" - "enabled": true -"tests": - "authentication": - "tenant1": - "clientId": "OAEuiZR0lUarZqFfJhHn4nO2KVq3Vt7v" - "clientSecret": "CTkMxmEStgZsF4C6v4N_OisrcLGxmZBJDU1kay3tq8Rzxu0jOCy8X21223A2YLZi" - "name": "stage-1" - "tenant2": - "clientId": "TatqZOJugh23Vl8ewwCpzYNytL4Y4sQ9" - "clientSecret": "Ov5_iHsEnP-6T63GhMlRkxMdMct8QSf8KEexNBcb1OWPyUWYlLk4zBJtCA6YCuHL" - "name": "default" diff --git a/eu-central-1.values.yaml b/eu-central-1.values.yaml deleted file mode 100644 index 0206a9d..0000000 --- a/eu-central-1.values.yaml +++ /dev/null @@ -1,90 +0,0 @@ -"accessController": - "dnsHost": "ac.eu-central-1.smartfacecloud.com" -"api": - "dnsHost": "noauth-api.eu-central-1.smartfacecloud.com" - "enabled": true -"authApi": - "dnsHost": "api.eu-central-1.smartfacecloud.com" - "enabled": true -"autoscaling": - "cron": - "enabled": false - "rmq": - "enabled": true -"configurations": - "apiAuth": - "existingConfigMapName": "auth-config" - "s3": - "existingConfigMapName": "s3-config" -"countlyPublisher": - "clusterName": "eu-central-1" - "enabled": true -"dbSynchronizationLeader": - "dnsHost": "dbsync.eu-central-1.smartfacecloud.com" - "enableAuth": true - "enabled": true -"detector": - "resources": - "requests": - "cpu": "750m" -"extractor": - "resources": - "requests": - "cpu": "750m" -"features": - "edgeStreams": - "enabled": false - "multitenancy": - "enabled": true -"graphqlApi": - "dnsHost": "graphql.eu-central-1.smartfacecloud.com" - "enableAuth": true -"ingress": - "certificateArn": "arn:aws:acm:eu-central-1:291501518763:certificate/255d18c4-9edc-4c7c-97de-c479b2b69dd3" - "class": "alb" - "includeAlbAnnotations": true -"liveness": - "resources": - "requests": - "cpu": "750m" -"matcher": - "resources": - "requests": - "cpu": "750m" -"metrics": - "enabled": true -"minio": - "enabled": false -"postgresql": - "enabled": false -"rabbitmq": - "auth": - "erlangCookie": "TYLe07z.rAYO" - "password": "[YxreAr}dt[+" - "mqttPublicService": - "enabled": false - "mqttDnsHost": "" -"serviceAccount": - "annotations": - "eks.amazonaws.com/role-arn": "arn:aws:iam::291501518763:role/smartface-staging-staging" - "name": "sf-service-account" -"sf-tenant-management": - "api": - "auth": - "existingConfigMap": "tenant-auth-config" - "enabled": true - "apiDnsHost": "tenants.staging.smartfacecloud.com" - "enabled": true -"station": - "dnsHost": "staging.smartfacecloud.com" - "enabled": true -"tests": - "authentication": - "tenant1": - "clientId": "OFQVQQuT2JfDfGIOAvmSofz9FboFRTHc" - "clientSecret": "DOY2AXQ3LPOzyIYVmNvUI-S2j0yEXwCGY8dH7CzqQlJAz-6kEY_UsNPQB7acZCtw" - "name": "stage-1" - "tenant2": - "clientId": "tLtnNJYPYbUIebOoGTvgpskkcf7mVhfJ" - "clientSecret": "Pzh6SfVa86pJWxABiUqrEwT55BvUeMMROF-ZZPpZZfKWdJ8e7WTsCB6CVKwzstEf" - "name": "default" diff --git a/templates/metrics/sf-service-monitor.yaml b/templates/metrics/sf-service-monitor.yaml index 83388fa..b9607cf 100644 --- a/templates/metrics/sf-service-monitor.yaml +++ b/templates/metrics/sf-service-monitor.yaml @@ -13,7 +13,7 @@ spec: matchLabels: {{- toYaml $.Values.metrics.serviceDiscoveryLabels | nindent 6 }} endpoints: - - {{- if not .Values.metrics.publishAllMetrics }} + - {{- if .Values.metrics.reducedMetricsForIngestion }} metricRelabelings: - action: drop regex: http_server_duration_ms_bucket