diff --git a/.github/workflows/scripts/.pinot_linter.sh b/.github/workflows/scripts/.pinot_linter.sh
index ca74747ee4be..ef4ba7a5f3d2 100755
--- a/.github/workflows/scripts/.pinot_linter.sh
+++ b/.github/workflows/scripts/.pinot_linter.sh
@@ -26,8 +26,8 @@ ifconfig
netstat -i
-mvn -B -ntp license:check || exit 1
-mvn -B -ntp checkstyle:check || exit 1
-mvn -B -ntp spotless:check || exit 1
-mvn -B -ntp enforcer:enforce || exit 1
+mvn -B -ntp -T1C license:check || exit 1
+mvn -B -ntp -T1C checkstyle:check || exit 1
+mvn -B -ntp -T1C spotless:check || exit 1
+mvn -B -ntp -T1C enforcer:enforce || exit 1
diff --git a/contrib/pinot-fmpp-maven-plugin/pom.xml b/contrib/pinot-fmpp-maven-plugin/pom.xml
deleted file mode 100644
index 0fbdc44f48a9..000000000000
--- a/contrib/pinot-fmpp-maven-plugin/pom.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
- 4.0.0
-
- pinot
- org.apache.pinot
- 1.2.0-SNAPSHOT
- ../..
-
-
- pinot-fmpp-maven-plugin
- Pinot FMPP plugin
- https://pinot.apache.org/
- maven-plugin
-
- ${basedir}/../..
- 3.8.2
- 0.9.16
- 2.3.32
-
-
-
-
- commons-io
- commons-io
-
-
- org.apache.maven
- maven-core
- ${maven.version}
-
-
- org.codehaus.plexus
- plexus-utils
-
-
- org.eclipse.sisu
- org.eclipse.sisu.plexus
-
-
-
-
- org.apache.maven
- maven-plugin-api
- ${maven.version}
-
-
- org.eclipse.sisu
- org.eclipse.sisu.plexus
-
-
-
-
- net.sourceforge.fmpp
- fmpp
- ${fmpp.version}
-
-
- org.freemarker
- freemarker
-
-
-
-
- org.freemarker
- freemarker
- ${freemarker.version}
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
- true
-
-
-
- org.apache.maven.plugins
- maven-plugin-plugin
-
- pinot-fmpp
-
-
-
- default-descriptor
-
- descriptor
-
- process-classes
-
-
- help-descriptor
-
- helpmojo
-
- process-classes
-
-
-
-
-
-
diff --git a/contrib/pinot-fmpp-maven-plugin/src/main/java/org/apache/pinot/fmpp/FMPPMojo.java b/contrib/pinot-fmpp-maven-plugin/src/main/java/org/apache/pinot/fmpp/FMPPMojo.java
deleted file mode 100644
index 787ac7606cd3..000000000000
--- a/contrib/pinot-fmpp-maven-plugin/src/main/java/org/apache/pinot/fmpp/FMPPMojo.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.pinot.fmpp;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Stopwatch;
-import fmpp.Engine;
-import fmpp.ProgressListener;
-import fmpp.progresslisteners.TerseConsoleProgressListener;
-import fmpp.setting.Settings;
-import fmpp.util.MiscUtil;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
-
-import static java.lang.String.format;
-
-
-/**
- * a maven plugin to run the freemarker generation incrementally
- * (if output has not changed, the files are not touched)
- *
- * @goal generate
- * @phase generate-sources
- */
-public class FMPPMojo extends AbstractMojo {
-
- /**
- * Used to add new source directories to the build.
- *
- * @parameter default-value="${project}"
- * @required
- * @readonly
- **/
- private MavenProject project;
-
- /**
- * Where to find the FreeMarker template files.
- *
- * @parameter default-value="src/main/resources/fmpp/templates/"
- * @required
- */
- private File templates;
-
- /**
- * Where to write the generated files of the output files.
- *
- * @parameter default-value="${project.build.directory}/generated-sources/fmpp/"
- * @required
- */
- private File output;
-
- /**
- * Location of the FreeMarker config file.
- *
- * @parameter default-value="src/main/resources/fmpp/config.fmpp"
- * @required
- */
- private File config;
-
- /**
- * compilation scope to be added to ("compile" or "test")
- *
- * @parameter default-value="compile"
- * @required
- */
- private String scope;
-
- /**
- * FMPP data model build parameter.
- *
- * @see FMPP Data Model Building
- * @parameter default-value=""
- */
- private String data;
-
- /**
- * if maven properties are added as data
- *
- * @parameter default-value="true"
- * @required
- */
- private boolean addMavenDataLoader;
-
- @Override
- public void execute()
- throws MojoExecutionException, MojoFailureException {
- if (project == null) {
- throw new MojoExecutionException("This plugin can only be used inside a project.");
- }
- String outputPath = output.getAbsolutePath();
- if ((!output.exists() && !output.mkdirs()) || !output.isDirectory()) {
- throw new MojoFailureException("can not write to output dir: " + outputPath);
- }
- String templatesPath = templates.getAbsolutePath();
- if (!templates.exists() || !templates.isDirectory()) {
- throw new MojoFailureException("templates not found in dir: " + outputPath);
- }
-
- // add the output directory path to the project source directories
- switch (scope) {
- case "compile":
- project.addCompileSourceRoot(outputPath);
- break;
- case "test":
- project.addTestCompileSourceRoot(outputPath);
- break;
- default:
- throw new MojoFailureException("scope must be compile or test");
- }
-
- final Stopwatch sw = Stopwatch.createStarted();
- try {
- getLog().info(
- format("Freemarker generation:\n scope: %s,\n config: %s,\n templates: %s", scope, config.getAbsolutePath(),
- templatesPath));
- final File tmp = Files.createTempDirectory("freemarker-tmp").toFile();
- String tmpPath = tmp.getAbsolutePath();
- final String tmpPathNormalized = tmpPath.endsWith(File.separator) ? tmpPath : tmpPath + File.separator;
- Settings settings = new Settings(new File("."));
- settings.set(Settings.NAME_SOURCE_ROOT, templatesPath);
- settings.set(Settings.NAME_OUTPUT_ROOT, tmp.getAbsolutePath());
- settings.load(config);
- settings.addProgressListener(new TerseConsoleProgressListener());
- settings.addProgressListener(new ProgressListener() {
- @Override
- public void notifyProgressEvent(Engine engine, int event, File src, int pMode, Throwable error, Object param)
- throws Exception {
- if (event == EVENT_END_PROCESSING_SESSION) {
- getLog().info(format("Freemarker generation took %dms", sw.elapsed(TimeUnit.MILLISECONDS)));
- sw.reset();
- Report report = moveIfChanged(tmp, tmpPathNormalized);
- if (!tmp.delete()) {
- throw new MojoFailureException(format("can not delete %s", tmp));
- }
- getLog().info(format("Incremental output update took %dms", sw.elapsed(TimeUnit.MILLISECONDS)));
- getLog().info(format("new: %d", report.newFiles));
- getLog().info(format("changed: %d", report.changedFiles));
- getLog().info(format("unchanged: %d", report.unchangedFiles));
- }
- }
- });
- List dataValues = new ArrayList<>();
- if (addMavenDataLoader) {
- getLog().info("Adding maven data loader");
- settings.setEngineAttribute(MavenDataLoader.MAVEN_DATA_ATTRIBUTE, new MavenDataLoader.MavenData(project));
- dataValues.add(format("maven: %s()", MavenDataLoader.class.getName()));
- }
- if (data != null) {
- dataValues.add(data);
- }
- if (!dataValues.isEmpty()) {
- String dataString = Joiner.on(",").join(dataValues);
- getLog().info("Setting data loader " + dataString);
-
- settings.add(Settings.NAME_DATA, dataString);
- }
- settings.execute();
- } catch (Exception e) {
- throw new MojoFailureException(MiscUtil.causeMessages(e), e);
- }
- }
-
- private static final class Report {
- int changedFiles;
- int unchangedFiles;
- int newFiles;
-
- Report(int changedFiles, int unchangedFiles, int newFiles) {
- super();
- this.changedFiles = changedFiles;
- this.unchangedFiles = unchangedFiles;
- this.newFiles = newFiles;
- }
-
- public Report() {
- this(0, 0, 0);
- }
-
- void add(Report other) {
- changedFiles += other.changedFiles;
- unchangedFiles += other.unchangedFiles;
- newFiles += other.newFiles;
- }
-
- public void addChanged() {
- ++changedFiles;
- }
-
- public void addNew() {
- ++newFiles;
- }
-
- public void addUnchanged() {
- ++unchangedFiles;
- }
- }
-
- private Report moveIfChanged(File root, String tmpPath)
- throws MojoFailureException, IOException {
- Report report = new Report();
- for (File file : root.listFiles()) {
- if (file.isDirectory()) {
- report.add(moveIfChanged(file, tmpPath));
- if (!file.delete()) {
- throw new MojoFailureException(format("can not delete %s", file));
- }
- } else {
- String absPath = file.getAbsolutePath();
- if (!absPath.startsWith(tmpPath)) {
- throw new MojoFailureException(format("%s should start with %s", absPath, tmpPath));
- }
- String relPath = absPath.substring(tmpPath.length());
- File outputFile = new File(output, relPath);
- if (!outputFile.exists()) {
- report.addNew();
- } else if (!FileUtils.contentEquals(file, outputFile)) {
- getLog().info(format("%s has changed", relPath));
- if (!outputFile.delete()) {
- throw new MojoFailureException(format("can not delete %s", outputFile));
- }
- report.addChanged();
- } else {
- report.addUnchanged();
- }
- if (!outputFile.exists()) {
- File parentDir = outputFile.getParentFile();
- if (parentDir.exists() && !parentDir.isDirectory()) {
- throw new MojoFailureException(
- format("can not move %s to %s as %s is not a dir", file, outputFile, parentDir));
- }
- if (!parentDir.exists() && !parentDir.mkdirs()) {
- throw new MojoFailureException(
- format("can not move %s to %s as dir %s can not be created", file, outputFile, parentDir));
- }
- FileUtils.moveFile(file, outputFile);
- } else {
- if (!file.delete()) {
- throw new MojoFailureException(format("can not delete %s", file));
- }
- }
- }
- }
- return report;
- }
-}
diff --git a/docker/images/pinot-superset/requirements-db.txt b/docker/images/pinot-superset/requirements-db.txt
index caf7d4a3ff72..322ab46c63af 100644
--- a/docker/images/pinot-superset/requirements-db.txt
+++ b/docker/images/pinot-superset/requirements-db.txt
@@ -17,4 +17,4 @@
# under the License.
#
pinotdb>=0.4.5
-redis==4.5.4
+redis>=4.6.0,<5.0
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
index ef2ab9f15307..ce5e5df7b9b0 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
@@ -1,76 +1,90 @@
rules:
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_authorization_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_authorization_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_documentsScanned_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_documentsScanned_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_entriesScannedInFilter_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_entriesScannedInFilter_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_entriesScannedPostFilter_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_entriesScannedPostFilter_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_freshnessLagMs_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_freshnessLagMs_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queries_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queries_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queryExecution_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryExecution_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queryRouting_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryRouting_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_reduce_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_reduce_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_requestCompilation_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_requestCompilation_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_scatterGather_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_scatterGather_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_totalServerResponseSize_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_totalServerResponseSize_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_groupBySize_$3"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_groupBySize_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_noServingHostForSegment_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_noServingHostForSegment_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_broker_healthcheck_$1_$2"
cache: true
@@ -98,57 +112,67 @@ rules:
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_broker_routingTableUpdateTime_$1"
cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_brokerResponsesWithPartialServersResponded_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithPartialServersResponded_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_brokerResponsesWithTimeouts_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithTimeouts_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_noServerFoundExceptions_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_noServerFoundExceptions_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_brokerResponsesWithProcessingExceptions_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithProcessingExceptions_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_brokerResponsesWithNumGroupsLimitReached_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithNumGroupsLimitReached_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queryQuotaExceeded_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryQuotaExceeded_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queryTotalTimeMs_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryTotalTimeMs_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_serverMissingForRouting_$3"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_serverMissingForRouting_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_deserialization_$2"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_deserialization_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_requestConnectionWait_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_requestConnectionWait_$4"
cache: true
labels:
- table: "$1"
+ database: "$2"
+ table: "$1$3"
- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
name: "pinot_$1_version"
cache: true
@@ -157,43 +181,48 @@ rules:
## Metrics that fit the catch-all patterns above should not be added to this file.
## In case a metric does not fit the catch-all patterns, add them before this comment
- # This is a catch-all pattern for pinot table metrics with offline/realtime suffix without kafka topic
- # Patterns after this line may be skipped.
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$4_$5"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$2_$8"
cache: true
labels:
- table: "$2"
- tableType: "$3"
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$2_$6"
+ database: "$4"
+ table: "$3$5"
+ tableType: "$6"
+ partition: "$7"
+ # This is a catch-all pattern for pinot table metrics with offline/realtime suffix without kafka topic
+ # Patterns after this line may be skipped.
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$6_$7"
cache: true
labels:
- table: "$3"
- tableType: "$4"
- partition: "$5"
+ database: "$3"
+ table: "$2$4"
+ tableType: "$5"
#when there is no partition in the metric
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$2_$5"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$2_$7"
cache: true
labels:
- table: "$3"
- tableType: "$4"
+ database: "$4"
+ table: "$3$5"
+ tableType: "$6"
#This is a catch-all pattern for pinot table metrics with offline/realtime suffix that also contain kafka topic
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$2_$7"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$2_$9"
cache: true
labels:
- table: "$3"
- tableType: "$4"
- topic: "$5"
- partition: "$6"
+ database: "$4"
+ table: "$3$5"
+ tableType: "$6"
+ topic: "$7"
+ partition: "$8"
# This is a catch-all pattern for pinot table metrics. Patterns after this line may be skipped.
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$3_$4"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$5_$6"
cache: true
labels:
- table: "$2"
+ database: "$3"
+ table: "$2$4"
# This is a catch-all pattern for pinot controller metrics not related to tables. Patterns after this line may be skipped.
- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
name: "pinot_$1_$2_$3"
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
index 45ff802de304..44b07d1718ef 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
@@ -8,54 +8,62 @@ rules:
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_helix_ZookeeperReconnects_$1"
cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_idealstateZnodeSize_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_idealstateZnodeSize_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_idealstateZnodeByteSize_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_idealstateZnodeByteSize_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_replicationFromConfig_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_replicationFromConfig_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_numberOfReplicas_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_numberOfReplicas_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_percentOfReplicas_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_percentOfReplicas_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_percentSegmentsAvailable_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_percentSegmentsAvailable_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_segmentCount_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_segmentCount_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_segmentsInErrorState_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_segmentsInErrorState_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_numberSegmentUploadTimeoutExceeded_$1"
cache: true
@@ -77,128 +85,146 @@ rules:
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_offlineTableCount_$1"
cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_validateion_$2_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_validateion_$4_$5"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_cronSchedulerJobScheduled_$3"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_cronSchedulerJobScheduled_$5"
cache: true
labels:
- table: "$1"
- taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_cronSchedulerJobTriggered_$3"
+ database: "$2"
+ table: "$1$3"
+ taskType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_cronSchedulerJobTriggered_$5"
cache: true
labels:
- table: "$1"
- taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_cronSchedulerJobSkipped_$3"
+ database: "$2"
+ table: "$1$3"
+ taskType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_cronSchedulerJobSkipped_$5"
cache: true
labels:
- table: "$1"
- taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_cronSchedulerJobExecutionTimeMs_$3"
+ database: "$2"
+ table: "$1$3"
+ taskType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_cronSchedulerJobExecutionTimeMs_$5"
cache: true
labels:
- table: "$1"
- taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableRebalanceExecutionTimeMs_$3"
+ database: "$2"
+ table: "$1$3"
+ taskType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableRebalanceExecutionTimeMs_$5"
cache: true
labels:
- table: "$1"
- result: "$2"
+ database: "$2"
+ table: "$1$3"
+ result: "$4"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_taskStatus_$3"
cache: true
labels:
taskType: "$1"
status: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_timeMsSinceLastMinionTaskMetadataUpdate_$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_timeMsSinceLastMinionTaskMetadataUpdate_$6"
cache: true
labels:
- table: "$1"
- tableType: "$2"
- taskType: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_$1_$5"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ taskType: "$5"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_$1_$7"
cache: true
labels:
- table: "$2"
- tableType: "$3"
- taskType: "$4"
+ database: "$3"
+ table: "$2$4"
+ tableType: "$5"
+ taskType: "$6"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_$1_$3"
cache: true
labels:
taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_timeMsSinceLastSuccessfulMinionTaskGeneration_$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_timeMsSinceLastSuccessfulMinionTaskGeneration_$6"
cache: true
labels:
- table: "$1"
- tableType: "$2"
- taskType: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_lastMinionTaskGenerationEncountersError_$4"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ taskType: "$5"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_lastMinionTaskGenerationEncountersError_$6"
cache: true
labels:
- table: "$1"
- tableType: "$2"
- taskType: "$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ taskType: "$5"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_pinotLeadControllerResourceEnabled_$1"
cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_offlineTableEstimatedSize_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_offlineTableEstimatedSize_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableQuota_$3"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableQuota_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_periodicTaskError_$4"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_periodicTaskError_$6"
cache: true
labels:
- table: "$1"
- tableType: "$2"
- periodicTask: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableStorageQuotaUtilization_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ periodicTask: "$5"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableStorageQuotaUtilization_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableStorageEstMissingSegmentPercent_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableStorageEstMissingSegmentPercent_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableTotalSizeOnServer_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableTotalSizeOnServer_$5"
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableSizePerReplicaOnServer_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableSizePerReplicaOnServer_$5"
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableCompressedSize_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableCompressedSize_$5"
labels:
- table: "$1"
- tableType: "$2"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
name: "pinot_$1_version"
cache: true
@@ -209,41 +235,46 @@ rules:
## In case a metric does not fit the catch-all patterns, add them before this comment
# This is a catch-all pattern for pinot table metrics with offline/realtime suffix without kafka topic
# Patterns after this line may be skipped.
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$4_$5"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$2_$8"
cache: true
labels:
- table: "$2"
- tableType: "$3"
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$2_$6"
+ database: "$4"
+ table: "$3$5"
+ tableType: "$6"
+ partition: "$7"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$6_$7"
cache: true
labels:
- table: "$3"
- tableType: "$4"
- partition: "$5"
+ database: "$3"
+ table: "$2$4"
+ tableType: "$5"
#This is a catch-all pattern for pinot table metrics with offline/realtime suffix that also contain kafka topic
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$2_$7"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$2_$9"
cache: true
labels:
- table: "$3"
- tableType: "$4"
- topic: "$5"
- partition: "$6"
+ database: "$4"
+ table: "$3$5"
+ tableType: "$6"
+ topic: "$7"
+ partition: "$8"
#when there is no partition in the metric
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$2_$5"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$2_$7"
cache: true
labels:
- table: "$3"
- tableType: "$4"
+ database: "$4"
+ table: "$3$5"
+ tableType: "$6"
# This is a catch-all pattern for pinot table metrics. Patterns after this line may be skipped.
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$3_$4"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$5_$6"
cache: true
labels:
- table: "$2"
+ database: "$3"
+ table: "$2$4"
# This is a catch-all pattern for pinot controller metrics not related to tables. Patterns after this line may be skipped.
- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
name: "pinot_$1_$2_$3"
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
index 584cde5963d3..3541cc8f3669 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
@@ -4,19 +4,21 @@ rules:
cache: true
labels:
version: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_minion_numberOfTasks_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_minion_numberOfTasks_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_minion_$4_$5"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_minion_$6_$7"
cache: true
labels:
- table: "$1"
- tableType: "$2"
- taskType: "$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ taskType: "$5"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_minion_$1_$2"
cache: true
@@ -36,18 +38,20 @@ rules:
# This is a catch-all pattern for pinot table metrics with offline/realtime suffix.
# Patterns after this line may be skipped.
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$4_$5"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$6_$7"
cache: true
labels:
- table: "$2"
- tableType: "$3"
+ database: "$3"
+ table: "$2$4"
+ tableType: "$5"
# This is a catch-all pattern for pinot table metrics. Patterns after this line may be skipped.
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
- name: "pinot_$1_$3_$4"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
+ name: "pinot_$1_$5_$6"
cache: true
labels:
- table: "$2"
+ database: "$3"
+ table: "$2$4"
# This is a catch-all pattern for pinot controller metrics not related to tables. Patterns after this line may be skipped.
- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)"
name: "pinot_$1_$2_$3"
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
index 6fc787cee93c..2739fb557d27 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
@@ -14,48 +14,62 @@ rules:
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_helix_ZookeeperReconnects_$1"
cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_idealstateZnodeSize_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_idealstateZnodeSize_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_idealstateZnodeByteSize_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_idealstateZnodeByteSize_$5"
+ cache: true
+ labels:
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_replicationFromConfig_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_numberOfReplicas_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_numberOfReplicas_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_percentOfReplicas_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_percentOfReplicas_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_percentSegmentsAvailable_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_percentSegmentsAvailable_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_segmentCount_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_segmentCount_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_segmentsInErrorState_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_segmentsInErrorState_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_numberSegmentUploadTimeoutExceeded_$1"
cache: true
@@ -77,205 +91,246 @@ rules:
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_offlineTableCount_$1"
cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_validateion_$2_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_validateion_$4_$5"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_cronSchedulerJobScheduled_$3"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_cronSchedulerJobScheduled_$5"
cache: true
labels:
- table: "$1"
- taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_cronSchedulerJobTriggered_$3"
+ database: "$2"
+ table: "$1$3"
+ taskType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_cronSchedulerJobTriggered_$5"
cache: true
labels:
- table: "$1"
- taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_cronSchedulerJobSkipped_$3"
+ database: "$2"
+ table: "$1$3"
+ taskType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_cronSchedulerJobSkipped_$5"
cache: true
labels:
- table: "$1"
- taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_cronSchedulerJobExecutionTimeMs_$3"
+ database: "$2"
+ table: "$1$3"
+ taskType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_cronSchedulerJobExecutionTimeMs_$5"
cache: true
labels:
- table: "$1"
- taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableRebalanceExecutionTimeMs_$3"
+ database: "$2"
+ table: "$1$3"
+ taskType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableRebalanceExecutionTimeMs_$5"
cache: true
labels:
- table: "$1"
- result: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ database: "$2"
+ table: "$1$3"
+ result: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_taskStatus_$3"
cache: true
labels:
taskType: "$1"
status: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_timeMsSinceLastMinionTaskMetadataUpdate_$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_timeMsSinceLastMinionTaskMetadataUpdate_$6"
cache: true
labels:
- table: "$1"
- tableType: "$2"
- taskType: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_$1_$5"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ taskType: "$5"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_$1_$7"
cache: true
labels:
- table: "$2"
- tableType: "$3"
- taskType: "$4"
+ database: "$3"
+ table: "$2$4"
+ tableType: "$5"
+ taskType: "$6"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_$1_$3"
cache: true
labels:
taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_timeMsSinceLastSuccessfulMinionTaskGeneration_$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_timeMsSinceLastSuccessfulMinionTaskGeneration_$6"
cache: true
labels:
- table: "$1"
- tableType: "$2"
- taskType: "$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_lastMinionTaskGenerationEncountersError_$4"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ taskType: "$5"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_lastMinionTaskGenerationEncountersError_$6"
cache: true
labels:
- table: "$1"
- tableType: "$2"
- taskType: "$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ taskType: "$5"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_controller_pinotLeadControllerResourceEnabled_$1"
cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_offlineTableEstimatedSize_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_offlineTableEstimatedSize_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_largestSegmentSizeOnServer_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_largestSegmentSizeOnServer_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableTotalSizeOnServer_$3"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableTotalSizeOnServer_$5"
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableSizePerReplicaOnServer_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableSizePerReplicaOnServer_$5"
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableCompressedSize_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableCompressedSize_$5"
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableQuota_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableQuota_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableStorageQuotaUtilization_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_periodicTaskError_$6"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_controller_tableStorageEstMissingSegmentPercent_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ periodicTask: "$5"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableStorageQuotaUtilization_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_controller_tableStorageEstMissingSegmentPercent_$5"
+ cache: true
+ labels:
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
# Pinot Broker
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_authorization_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_authorization_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_documentsScanned_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_documentsScanned_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_entriesScannedInFilter_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_entriesScannedInFilter_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_entriesScannedPostFilter_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_entriesScannedPostFilter_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_freshnessLagMs_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_freshnessLagMs_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queries_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queries_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queryExecution_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryExecution_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queryRouting_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryRouting_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queryTotalTimeMs_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryTotalTimeMs_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_reduce_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_reduce_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_requestCompilation_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_requestCompilation_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_scatterGather_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_scatterGather_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_totalServerResponseSize_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_totalServerResponseSize_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_groupBySize_$3"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_groupBySize_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_noServingHostForSegment_$3"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_noServingHostForSegment_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_broker_healthcheck_$1_$2"
cache: true
@@ -303,111 +358,150 @@ rules:
- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
name: "pinot_broker_routingTableUpdateTime_$1"
cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_brokerResponsesWithPartialServersResponded_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithPartialServersResponded_$4"
+ cache: true
+ labels:
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithProcessingExceptions_$4"
+ cache: true
+ labels:
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithNumGroupsLimitReached_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_brokerResponsesWithProcessingExceptions_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryQuotaExceeded_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_brokerResponsesWithNumGroupsLimitReached_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_serverMissingForRouting_$5"
+ cache: true
+ labels:
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_deserialization_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_queryQuotaExceeded_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_requestConnectionWait_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_serverMissingForRouting_$3"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithTimeouts_$4"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_deserialization_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_noServerFoundExceptions_$4"
cache: true
labels:
- table: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_broker_requestConnectionWait_$2"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_brokerResponsesWithProcessingExceptions_$4"
cache: true
labels:
- table: "$1"
+ database: "$2"
+ table: "$1$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_broker_queryTotalTimeMs_$4"
+ cache: true
+ labels:
+ database: "$2"
+ table: "$1$3"
# Pinot Server
-- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
- name: "pinot_server_documentCount_$3"
+- pattern: "\"org.apache.pinot.common.metrics\"<>(\\w+)"
+ name: "pinot_server_documentCount_$5"
cache: true
labels:
- table: "$1"
- tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"