BartMiki commented on code in PR #14935:
URL: https://github.com/apache/druid/pull/14935#discussion_r1420385425
##########
docs/development/extensions-contrib/prometheus.md:
##########
@@ -47,6 +46,8 @@ All the configuration parameters for the Prometheus emitter
are under `druid.emi
| `druid.emitter.prometheus.pushGatewayAddress` | Pushgateway address.
Required if using `pushgateway` strategy.
| no | none
|
| `druid.emitter.prometheus.flushPeriod` | Emit metrics to Pushgateway
every `flushPeriod` seconds. Required if `pushgateway` strategy is used.
| no | 15
|
| `druid.emitter.prometheus.extraLabels` | JSON key-value pairs for
additional labels on all metrics. Keys (label names) must match the regex
`[a-zA-Z_:][a-zA-Z0-9_:]*`. Example: `{"cluster_name": "druid_cluster1", "env":
"staging"}`. | no | none
|
+| `druid.emitter.prometheus.pushGatewayDeleteOnShutdown` | Flag to delete
metrics from Pushgateway on shutdown. Works only if `pushgateway` strategy is
used.
| no | false |
+| `druid.emitter.prometheus.waitForShutdownDelay` | Time to wait for
Pushgateway to delete metrics on shutdown in seconds (e.g. 60). Works only if
`pushgateway` strategy is used. Be aware, that task can terminate before the
deletion is performed, when the [Peon's
`druid.indexer.task.gracefulShutdownTimeout` is
used](https://druid.apache.org/docs/latest/configuration/#additional-peon-configuration).
| no | none |
Review Comment:
Done
##########
extensions-contrib/prometheus-emitter/src/main/java/org/apache/druid/emitter/prometheus/PrometheusEmitter.java:
##########
@@ -202,11 +209,35 @@ public void close()
{
if (strategy.equals(PrometheusEmitterConfig.Strategy.exporter)) {
if (server != null) {
- server.stop();
+ server.close();
}
} else {
exec.shutdownNow();
flush();
+
+ try {
+ if (config.getWaitForShutdownDelay() > 0) {
+ Thread.sleep(config.getWaitForShutdownDelay());
+ }
+ }
+ catch (InterruptedException e) {
+ log.error(e, "Interrupted while waiting for shutdown delay. Deleting
metrics now.");
+ }
+ finally {
+ deletePushGatewayMetrics();
+ }
+ }
+ }
+
+ private void deletePushGatewayMetrics()
+ {
+ if (pushGateway != null && config.isPushGatewayDeleteOnShutdown()) {
+ try {
+ pushGateway.delete(config.getNamespace(),
ImmutableMap.of(config.getNamespace(), identifier));
+ }
+ catch (IOException e) {
+ log.error(e, "Unable to delete prometheus metrics from pushGateway");
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
