From d430a2ab5eb321a88b4846e42e70a4079516be5a Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Thu, 4 Feb 2016 09:27:53 +0100 Subject: [PATCH] Apply feedback from @uboness Original commit: elastic/x-pack-elasticsearch@cb7c3476575366a01aa2165fc482068239e09e36 --- .../src/main/java/org/elasticsearch/marvel/MarvelPlugin.java | 2 +- .../src/main/java/org/elasticsearch/watcher/WatcherPlugin.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java index 711840e2945..331c2c887f1 100644 --- a/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java +++ b/elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/MarvelPlugin.java @@ -133,6 +133,6 @@ public class MarvelPlugin extends Plugin { module.registerSetting(Setting.simpleString("marvel.agent.exporter.es.ssl.truststore.password", false, Setting.Scope.CLUSTER)); module.registerSetting(Setting.simpleString("marvel.agent.exporter.es.ssl.truststore.path", false, Setting.Scope.CLUSTER)); module.registerSetting(Setting.boolSetting("marvel.enabled", false, false, Setting.Scope.CLUSTER)); - module.registerSettingsFilter("marvel.agent.exporters.auth.password"); + module.registerSettingsFilter("marvel.agent.exporters.*.auth.password"); } } diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherPlugin.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherPlugin.java index 4dbfb048aa1..9f5c5be01ba 100644 --- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherPlugin.java +++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/WatcherPlugin.java @@ -221,7 +221,6 @@ public class WatcherPlugin extends Plugin { module.registerSettingsFilter("watcher.actions.email.service.account.*.smtp.password"); module.registerSettingsFilter("watcher.actions.slack.service.account.*.url"); - module.registerSettingsFilter("watcher.actions.hipchat.service.account.*.url"); module.registerSettingsFilter("watcher.actions.pagerduty.service.account.*.url"); module.registerSettingsFilter("watcher.actions.pagerduty.service." + PagerDutyAccount.SERVICE_KEY_SETTING); module.registerSettingsFilter("watcher.actions.pagerduty.service.account.*." + PagerDutyAccount.SERVICE_KEY_SETTING);