From 6b1f6605e691e927ef475b618cef5818c134ba8f Mon Sep 17 00:00:00 2001 From: Ralph Weires Date: Mon, 23 Oct 2023 09:08:34 +0200 Subject: [PATCH] Align example-configs to naming changes of #852 Signed-off-by: Ralph Weires --- example_configs/activemq.yml | 4 ++-- example_configs/cassandra.yml | 4 ++-- example_configs/tomcat.yml | 4 ++-- example_configs/weblogic.yml | 2 +- example_configs/wildfly-10.yaml | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/example_configs/activemq.yml b/example_configs/activemq.yml index f983c9c8..3a80c82d 100644 --- a/example_configs/activemq.yml +++ b/example_configs/activemq.yml @@ -1,8 +1,8 @@ lowercaseOutputName: true lowercaseOutputLabelNames: true -blacklistObjectNames: +excludeObjectNames: - "org.apache.activemq:clientId=*,*" -whitelistObjectNames: +includeObjectNames: - "org.apache.activemq:destinationType=Queue,*" - "org.apache.activemq:destinationType=Topic,*" - "org.apache.activemq:type=Broker,brokerName=*" diff --git a/example_configs/cassandra.yml b/example_configs/cassandra.yml index be13c0f4..c85e187c 100644 --- a/example_configs/cassandra.yml +++ b/example_configs/cassandra.yml @@ -1,8 +1,8 @@ lowercaseOutputLabelNames: true lowercaseOutputName: true -whitelistObjectNames: ["org.apache.cassandra.metrics:*"] +includeObjectNames: ["org.apache.cassandra.metrics:*"] # ColumnFamily is an alias for Table metrics -blacklistObjectNames: ["org.apache.cassandra.metrics:type=ColumnFamily,*"] +excludeObjectNames: ["org.apache.cassandra.metrics:type=ColumnFamily,*"] rules: # Generic gauges with 0-2 labels - pattern: org.apache.cassandra.metrics<>Value diff --git a/example_configs/tomcat.yml b/example_configs/tomcat.yml index c47cb730..21b4793d 100644 --- a/example_configs/tomcat.yml +++ b/example_configs/tomcat.yml @@ -2,8 +2,8 @@ --- lowercaseOutputLabelNames: true lowercaseOutputName: true -whitelistObjectNames: ["java.lang:type=OperatingSystem", "Catalina:*"] -blacklistObjectNames: [] +includeObjectNames: ["java.lang:type=OperatingSystem", "Catalina:*"] +excludeObjectNames: [] rules: - pattern: 'Catalina<>serverInfo: (.+)' name: tomcat_serverinfo diff --git a/example_configs/weblogic.yml b/example_configs/weblogic.yml index 4e2b003a..09684520 100644 --- a/example_configs/weblogic.yml +++ b/example_configs/weblogic.yml @@ -5,7 +5,7 @@ attrNameSnakeCase: true lowercaseOutputName: true lowercaseOutputLabelNames: true -whitelistObjectNames: +includeObjectNames: - "com.bea:Name=*,Type=ServerRuntime" - "com.bea:ServerRuntime=*,Type=ApplicationRuntime,*" - "com.bea:ServerRuntime=*,Type=JDBCDataSourceRuntime,*" diff --git a/example_configs/wildfly-10.yaml b/example_configs/wildfly-10.yaml index f0f989d4..b3480e44 100644 --- a/example_configs/wildfly-10.yaml +++ b/example_configs/wildfly-10.yaml @@ -1,11 +1,11 @@ --- lowercaseOutputName: true lowercaseOutputLabelNames: true -whitelistObjectNames: - # Whitelist objects to be collected, for performance reason +includeObjectNames: + # Include objects to be collected, for performance reason # see https://github.com/prometheus/jmx_exporter/issues/246#issuecomment-367573931 - # Each object in the rules below has to be added to whitelistObjectNames too ! - # note that rules use regex (like "foo.*", whereas the whitelist use globbing expressions (like "foo*") + # Each object in the rules below has to be added to includeObjectNames too ! + # note that rules use regex (like "foo.*", whereas the includes use globbing expressions (like "foo*") - "jboss.as:subsystem=messaging-activemq,server=*,jms-queue=*" - "jboss.as:subsystem=messaging-activemq,server=*,jms-topic=*" - "jboss.as:subsystem=datasources,data-source=*,statistics=*"