Skip to content

Commit dde883b

Browse files
committed
MLE-24747 Bumping version and hopefully removing prometheus correctly
1 parent b3edddf commit dde883b

File tree

6 files changed

+1
-34
lines changed

6 files changed

+1
-34
lines changed

docker/prometheus/config/alertmanager-generated.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

docker/prometheus/config/prometheus-generated.yml

Whitespace-only changes.

docker/prometheus/config/web-config-am.yml

Whitespace-only changes.

docker/prometheus/config/web-config-prom.yml

Whitespace-only changes.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=com.marklogic
2-
version=1.11.0
2+
version=2.0.0
33

44
# For the Confluent Connector Archive
55
componentOwner=marklogic

test-app/docker-compose.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ services:
4949
KAFKA_CONFLUENT_TELEMETRY_EXPORTER_C3PLUSPLUS_TYPE: "http"
5050
KAFKA_CONFLUENT_TELEMETRY_EXPORTER_C3PLUSPLUS_ENABLED: "true"
5151
KAFKA_CONFLUENT_TELEMETRY_EXPORTER_C3PLUSPLUS_METRICS_INCLUDE: "io.confluent.kafka.server.request.(?!.*delta).*|io.confluent.kafka.server.server.broker.state|io.confluent.kafka.server.replica.manager.leader.count|io.confluent.kafka.server.request.queue.size|io.confluent.kafka.server.broker.topic.failed.produce.requests.rate.1.min|io.confluent.kafka.server.tier.archiver.total.lag|io.confluent.kafka.server.request.total.time.ms.p99|io.confluent.kafka.server.broker.topic.failed.fetch.requests.rate.1.min|io.confluent.kafka.server.broker.topic.total.fetch.requests.rate.1.min|io.confluent.kafka.server.partition.caught.up.replicas.count|io.confluent.kafka.server.partition.observer.replicas.count|io.confluent.kafka.server.tier.tasks.num.partitions.in.error|io.confluent.kafka.server.broker.topic.bytes.out.rate.1.min|io.confluent.kafka.server.request.total.time.ms.p95|io.confluent.kafka.server.controller.active.controller.count|io.confluent.kafka.server.request.total.time.ms.p999|io.confluent.kafka.server.controller.active.broker.count|io.confluent.kafka.server.request.handler.pool.request.handler.avg.idle.percent.rate.1.min|io.confluent.kafka.server.controller.unclean.leader.elections.rate.1.min|io.confluent.kafka.server.replica.manager.partition.count|io.confluent.kafka.server.controller.unclean.leader.elections.total|io.confluent.kafka.server.partition.replicas.count|io.confluent.kafka.server.broker.topic.total.produce.requests.rate.1.min|io.confluent.kafka.server.controller.offline.partitions.count|io.confluent.kafka.server.socket.server.network.processor.avg.idle.percent|io.confluent.kafka.server.partition.under.replicated|io.confluent.kafka.server.log.log.start.offset|io.confluent.kafka.server.log.tier.size|io.confluent.kafka.server.log.size|io.confluent.kafka.server.tier.fetcher.bytes.fetched.total|io.confluent.kafka.server.request.total.time.ms.p50|io.confluent.kafka.server.tenant.consumer.lag.offsets|io.confluent.kafka.server.log.log.end.offset|io.confluent.kafka.server.broker.topic.bytes.in.rate.1.min|io.confluent.kafka.server.partition.under.min.isr|io.confluent.kafka.server.partition.in.sync.replicas.count|io.confluent.telemetry.http.exporter.batches.dropped|io.confluent.telemetry.http.exporter.items.total|io.confluent.telemetry.http.exporter.items.succeeded|io.confluent.telemetry.http.exporter.send.time.total.millis|io.confluent.kafka.server.controller.leader.election.rate.(?!.*delta).*|io.confluent.telemetry.http.exporter.batches.failed"
52-
KAFKA_CONFLUENT_TELEMETRY_EXPORTER_C3PLUSPLUS_CLIENT_BASE_URL: "http://prometheus:9090/api/v1/otlp"
5352
KAFKA_CONFLUENT_TELEMETRY_EXPORTER_C3PLUSPLUS_CLIENT_COMPRESSION: "gzip"
5453
KAFKA_CONFLUENT_TELEMETRY_EXPORTER_C3PLUSPLUS_API_KEY: "dummy"
5554
KAFKA_CONFLUENT_TELEMETRY_EXPORTER_C3PLUSPLUS_API_SECRET: "dummy"
@@ -106,28 +105,10 @@ services:
106105
volumes:
107106
- ../docker/confluent-marklogic-components:/usr/share/confluent-marklogic-components
108107

109-
prometheus:
110-
image: confluentinc/cp-enterprise-prometheus:2.2.0
111-
hostname: cp-enterprise-prometheus
112-
container_name: prometheus
113-
volumes:
114-
- ../docker/prometheus/config:/mnt/config
115-
ports:
116-
- "9090:9090"
117-
cap_drop:
118-
- NET_RAW
119-
environment:
120-
CONFIG_PATH: "/mnt/config"
121-
SHOULD_LOG_TO_FILE: false
122-
123108
alertmanager:
124109
image: confluentinc/cp-enterprise-alertmanager:2.2.0
125110
hostname: cp-enterprise-alertmanager
126111
container_name: alertmanager
127-
depends_on:
128-
- prometheus
129-
volumes:
130-
- ../docker/prometheus/config:/mnt/config
131112
ports:
132113
- "9093:9093"
133114
cap_drop:
@@ -145,14 +126,11 @@ services:
145126
- schema-registry
146127
- connect
147128
- ksqldb-server
148-
- prometheus
149129
- alertmanager
150130
ports:
151131
- "9021:9021"
152132
cap_drop:
153133
- NET_RAW
154-
volumes:
155-
- ../docker/prometheus/config:/mnt/config
156134
environment:
157135
CONTROL_CENTER_BOOTSTRAP_SERVERS: 'broker:29092'
158136
CONTROL_CENTER_CONNECT_CONNECT-DEFAULT_CLUSTER: 'connect:8083'
@@ -164,9 +142,6 @@ services:
164142
CONTROL_CENTER_INTERNAL_TOPICS_PARTITIONS: 1
165143
CONTROL_CENTER_MONITORING_INTERCEPTOR_TOPIC_PARTITIONS: 1
166144
CONFLUENT_METRICS_TOPIC_REPLICATION: 1
167-
CONTROL_CENTER_PROMETHEUS_ENABLE: true
168-
CONTROL_CENTER_PROMETHEUS_URL: http://prometheus:9090
169-
CONTROL_CENTER_PROMETHEUS_RULES_FILE: /mnt/config/trigger_rules-generated.yml
170145
CONTROL_CENTER_ALERTMANAGER_URL: http://alertmanager:9093
171146
CONTROL_CENTER_ALERTMANAGER_CONFIG_FILE: /mnt/config/alertmanager-generated.yml
172147
PORT: 9021

0 commit comments

Comments
 (0)