tenant: off-board managedkafka

rhobs · Aug 3, 2023 · 95a1261 · 95a1261
1 parent 0caac3b
commit 95a1261
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 103 deletions.
diff --git a/configuration/observatorium/metric-federation-rules.libsonnet b/configuration/observatorium/metric-federation-rules.libsonnet
@@ -2,48 +2,6 @@
   prometheus+:: {
     recordingrules+: {
       groups+: [
-        {
-          name: 'kafka.rules',
-          interval: '1m',
-          rules: [
-            {
-              record: 'kafka_id:strimzi_resource_state:max_over_time1h',
-              expr: |||
-                kafka_id:strimzi_resource_state:max_over_time1h
-              |||,
-            },
-            {
-              record: 'kafka_id:haproxy_server_bytes_in_total:rate1h_gibibytes',
-              expr: |||
-                kafka_id:haproxy_server_bytes_in_total:rate1h_gibibytes
-              |||,
-            },
-            {
-              record: 'kafka_id:haproxy_server_bytes_out_total:rate1h_gibibytes',
-              expr: |||
-                kafka_id:haproxy_server_bytes_out_total:rate1h_gibibytes
-              |||,
-            },
-            {
-              record: 'kafka_id:kafka_broker_quota_totalstorageusedbytes:max_over_time1h_gibibytes',
-              expr: |||
-                kafka_id:kafka_broker_quota_totalstorageusedbytes:max_over_time1h_gibibytes
-              |||,
-            },
-            {
-              record: 'kafka_id:haproxy_server_bytes_in_out_total:rate1h_gibibytes',
-              expr: |||
-                kafka_id:haproxy_server_bytes_in_out_total:rate1h_gibibytes
-              |||,
-            },
-            {
-              record: 'kafka_id:kafka_broker_quota_totalstorageusedbytes:max_over_time1h_gibibyte_months',
-              expr: |||
-                kafka_id:kafka_broker_quota_totalstorageusedbytes:max_over_time1h_gibibyte_months
-              |||,
-            },
-          ],
-        },
         {
           name: 'rhacs.rules',
           interval: '1m',

diff --git a/configuration/observatorium/ruler-remote-write.libsonnet b/configuration/observatorium/ruler-remote-write.libsonnet
@@ -94,29 +94,6 @@ function(params) {
         max_backoff: '5m',
       },
     },
-    {
-      url: params.url,
-      name: 'receive-managedkafka',
-      headers: {
-        'THANOS-TENANT': '63e320cd-622a-4d05-9585-ffd48342633e',
-      },
-      write_relabel_configs: [
-        {
-          source_labels: ['tenant_id'],
-          regex: '63e320cd-622a-4d05-9585-ffd48342633e',
-          action: 'keep',
-        },
-      ],
-      queue_config: {
-        capacity: 120000,
-        max_shards: 50,
-        min_shards: 1,
-        max_samples_per_send: 40000,
-        batch_send_deadline: '5s',
-        min_backoff: '5s',
-        max_backoff: '5m',
-      },
-    },
     {
       url: params.url,
       name: 'receive-rhacs',

diff --git a/resources/services/metric-federation-rule-template.yaml b/resources/services/metric-federation-rule-template.yaml
@@ -7,39 +7,6 @@ objects:
   data:
     observatorium.yaml: |-
       "groups":
-      - "interval": "1m"
-        "name": "telemeter-kafka.rules"
-        "rules":
-        - "expr": |
-            kafka_id:strimzi_resource_state:max_over_time1h
-          "labels":
-            "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
-          "record": "kafka_id:strimzi_resource_state:max_over_time1h"
-        - "expr": |
-            kafka_id:haproxy_server_bytes_in_total:rate1h_gibibytes
-          "labels":
-            "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
-          "record": "kafka_id:haproxy_server_bytes_in_total:rate1h_gibibytes"
-        - "expr": |
-            kafka_id:haproxy_server_bytes_out_total:rate1h_gibibytes
-          "labels":
-            "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
-          "record": "kafka_id:haproxy_server_bytes_out_total:rate1h_gibibytes"
-        - "expr": |
-            kafka_id:kafka_broker_quota_totalstorageusedbytes:max_over_time1h_gibibytes
-          "labels":
-            "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
-          "record": "kafka_id:kafka_broker_quota_totalstorageusedbytes:max_over_time1h_gibibytes"
-        - "expr": |
-            kafka_id:haproxy_server_bytes_in_out_total:rate1h_gibibytes
-          "labels":
-            "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
-          "record": "kafka_id:haproxy_server_bytes_in_out_total:rate1h_gibibytes"
-        - "expr": |
-            kafka_id:kafka_broker_quota_totalstorageusedbytes:max_over_time1h_gibibyte_months
-          "labels":
-            "tenant_id": "FB870BF3-9F3A-44FF-9BF7-D7A047A52F43"
-          "record": "kafka_id:kafka_broker_quota_totalstorageusedbytes:max_over_time1h_gibibyte_months"
       - "interval": "1m"
         "name": "telemeter-rhacs.rules"
         "rules":

diff --git a/resources/services/observatorium-template.yaml b/resources/services/observatorium-template.yaml
@@ -1337,7 +1337,6 @@ objects:
           - --memcached.expire=${OPA_AMS_MEMCACHED_EXPIRE}
           - --ams.mappings=osd=${OSD_ORGANIZATION_ID}
           - --ams.mappings=osd=${SD_OPS_ORGANIZATION_ID}
-          - --ams.mappings=managedkafka=${MANAGEDKAFKA_ORGANIZATION_ID}
           - --ams.mappings=cnvqe=${CNVQE_ORGANIZATION_ID}
           - --internal.tracing.endpoint=localhost:6831
           env:
@@ -1872,8 +1871,6 @@ parameters:
   value: "19291"
 - name: CNVQE_ORGANIZATION_ID
   value: ""
-- name: MANAGEDKAFKA_ORGANIZATION_ID
-  value: ""
 - name: OSD_ORGANIZATION_ID
   value: ""
 - name: SD_OPS_ORGANIZATION_ID

diff --git a/services/observatorium-template.jsonnet b/services/observatorium-template.jsonnet
@@ -102,7 +102,6 @@ local obs = import 'observatorium.libsonnet';
     { name: 'METRICS_WRITE_SERVICE_PORT', value: std.toString(obs.thanos.receiversService.spec.ports[2].port) },
     // AMS Org IDs
     { name: 'CNVQE_ORGANIZATION_ID', value: '' },
-    { name: 'MANAGEDKAFKA_ORGANIZATION_ID', value: '' },
     { name: 'OSD_ORGANIZATION_ID', value: '' },
     { name: 'SD_OPS_ORGANIZATION_ID', value: '' },
   ],

diff --git a/services/observatorium.libsonnet b/services/observatorium.libsonnet
@@ -526,7 +526,6 @@ local obsctlReloader = (import 'github.com/rhobs/obsctl-reloader/jsonnet/lib/obs
       mappings: [
         'osd=${OSD_ORGANIZATION_ID}',
         'osd=${SD_OPS_ORGANIZATION_ID}',
-        'managedkafka=${MANAGEDKAFKA_ORGANIZATION_ID}',
         'cnvqe=${CNVQE_ORGANIZATION_ID}',
       ],
       memcached: '%s.%s.svc.cluster.local:%d' % [