diff --git a/snuba/cli/devserver.py b/snuba/cli/devserver.py index 9e49670822..42c53867d5 100644 --- a/snuba/cli/devserver.py +++ b/snuba/cli/devserver.py @@ -319,19 +319,6 @@ def devserver(*, bootstrap: bool, workers: bool) -> None: "--schedule-ttl=10", ], ), - ( - "subscriptions-scheduler-generic-metrics-gauges", - [ - "snuba", - "subscriptions-scheduler", - "--entity=generic_metrics_gauges", - "--consumer-group=snuba-generic-metrics-gauges-subscriptions-schedulers", - "--followed-consumer-group=snuba-generic-metrics-gauges-consumers", - "--auto-offset-reset=latest", - "--log-level=debug", - "--schedule-ttl=10", - ], - ), ( "subscriptions-executor-metrics", [ diff --git a/snuba/datasets/configuration/generic_metrics/entities/gauges.yaml b/snuba/datasets/configuration/generic_metrics/entities/gauges.yaml index 9cb7d84eb1..7e3c926f7b 100644 --- a/snuba/datasets/configuration/generic_metrics/entities/gauges.yaml +++ b/snuba/datasets/configuration/generic_metrics/entities/gauges.yaml @@ -26,7 +26,11 @@ schema: { name: tags.raw_value, type: Array, - args: { schema_modifiers: [readonly], inner_type: { type: String } }, + args: + { + schema_modifiers: [readonly], + inner_type: { type: String }, + }, }, { name: min, @@ -255,14 +259,3 @@ validators: required_filter_columns: ["org_id", "project_id"] required_time_column: timestamp partition_key_column_name: org_id -subscription_processors: - - processor: AddColumnCondition - args: - extra_condition_data_key: organization - extra_condition_column: org_id -subscription_validators: - - validator: AggregationValidator - args: - max_allowed_aggregations: 3 - disallowed_aggregations: [having, orderby] - required_time_column: timestamp diff --git a/snuba/datasets/configuration/generic_metrics/storages/gauges_bucket.yaml b/snuba/datasets/configuration/generic_metrics/storages/gauges_bucket.yaml index 73b06e88d7..a5f65ca2a3 100644 --- a/snuba/datasets/configuration/generic_metrics/storages/gauges_bucket.yaml +++ b/snuba/datasets/configuration/generic_metrics/storages/gauges_bucket.yaml @@ -78,10 +78,4 @@ stream_loader: args: header_key: metric_type header_value: g - commit_log_topic: snuba-generic-metrics-gauges-commit-log - subscription_scheduler_mode: global - subscription_synchronization_timestamp: orig_message_ts - subscription_scheduled_topic: scheduled-subscriptions-generic-metrics-gauges - subscription_result_topic: generic-metrics-subscription-results - subscription_delay_seconds: 60 dlq_topic: snuba-dead-letter-generic-metrics diff --git a/snuba/utils/streams/topics.py b/snuba/utils/streams/topics.py index da8ce87206..6c8d6393ac 100644 --- a/snuba/utils/streams/topics.py +++ b/snuba/utils/streams/topics.py @@ -31,9 +31,6 @@ class Topic(Enum): SUBSCRIPTION_SCHEDULED_GENERIC_METRICS_COUNTERS = ( "scheduled-subscriptions-generic-metrics-counters" ) - SUBSCRIPTION_SCHEDULED_GENERIC_METRICS_GAUGES = ( - "scheduled-subscriptions-generic-metrics-gauges" - ) SUBSCRIPTION_RESULTS_EVENTS = "events-subscription-results" SUBSCRIPTION_RESULTS_TRANSACTIONS = "transactions-subscription-results" @@ -52,7 +49,6 @@ class Topic(Enum): "snuba-generic-metrics-distributions-commit-log" ) GENERIC_METRICS_COUNTERS_COMMIT_LOG = "snuba-generic-metrics-counters-commit-log" - GENERIC_METRICS_GAUGES_COMMIT_LOG = "snuba-generic-metrics-gauges-commit-log" GENERIC_EVENTS = "generic-events" GENERIC_EVENTS_COMMIT_LOG = "snuba-generic-events-commit-log" GROUP_ATTRIBUTES = "group-attributes"