Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tenant: off-board managedkafka #573

Merged
merged 1 commit into from
Aug 3, 2023
Merged

tenant: off-board managedkafka #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions configuration/observatorium/metric-federation-rules.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
23 changes: 0 additions & 23 deletions configuration/observatorium/ruler-remote-write.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
33 changes: 0 additions & 33 deletions resources/services/metric-federation-rule-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
3 changes: 0 additions & 3 deletions resources/services/observatorium-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion services/observatorium-template.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: '' },
],
Expand Down
1 change: 0 additions & 1 deletion services/observatorium.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' % [
Expand Down
Loading