This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch adding_jmx_to_pinot_docker_image
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 77de99331542c4147a5371bb6850934770d49cc4
Author: Xiang Fu <fx19880...@gmail.com>
AuthorDate: Mon Jun 1 14:29:09 2020 -0700
Upgrade pinot docker packaging and adding jmx agent
---
docker/images/pinot/Dockerfile | 4 +-
.../etc/jmx_prometheus_javaagent/configs/pinot.yml | 208 +++++++++++++++++++++
.../jmx_prometheus_javaagent-0.12.0.jar | Bin 0 -> 370075 bytes
.../docker}/ingestion-job-specs/airlineStats.yaml | 0
.../docker}/ingestion-job-specs/baseballStats.yaml | 0
.../airlineStats_realtime_table_config.json | 0
.../meetupRsvp_realtime_table_config.json | 0
7 files changed, 210 insertions(+), 2 deletions(-)
diff --git a/docker/images/pinot/Dockerfile b/docker/images/pinot/Dockerfile
index 32c6a9b..e040697 100644
--- a/docker/images/pinot/Dockerfile
+++ b/docker/images/pinot/Dockerfile
@@ -72,9 +72,9 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
COPY --from=pinot_build_env ${PINOT_HOME} ${PINOT_HOME}
-COPY ingestion-job-specs ${PINOT_HOME}/examples/docker/ingestion-job-specs
-COPY table-configs ${PINOT_HOME}/examples/docker/table-configs
COPY bin ${PINOT_HOME}/bin
+COPY etc ${PINOT_HOME}/etc
+COPY examples ${PINOT_HOME}/examples
# expose ports for controller/broker/server/admin
EXPOSE 9000 8099 8098 8097 8096
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
new file mode 100644
index 0000000..2f3d253
--- /dev/null
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
@@ -0,0 +1,208 @@
+rules:
+# Pinot Controller
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllercontroller(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerhelix\\.(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_helix_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerhelixZookeeperReconnects\"><>(\\w+)"
+ name: "pinot_controller_helix_ZookeeperReconnects_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controlleridealstateZnodeSize.(\\w+)_(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_idealstateZnodeSize_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllernumberOfReplicas.(\\w+)_(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_numberOfReplicas_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerpercentOfReplicas.(\\w+)_(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_percentOfReplicas_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerpercentSegmentsAvailable.(\\w+)_(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_percentSegmentsAvailable_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllersegmentCount.(\\w+)_(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_segmentCount_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllersegmentsInErrorState.(\\w+)_(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_segmentsInErrorState_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllernumberSegmentUploadTimeoutExceeded\"><>(\\w+)"
+ name: "pinot_controller_numberSegmentUploadTimeoutExceeded_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllernumberTimesScheduleTasksCalled\"><>(\\w+)"
+ name: "pinot_controller_numberTimesScheduleTasksCalled_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerperiodicTaskNumTablesProcessed.(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_periodicTaskNumTablesProcessed_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerpinotControllerLeader\"><>(\\w+)"
+ name: "pinot_controller_pinotControllerLeader_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerpinotControllerPartitionLeader.(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_partitionLeader_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerrealtimeTableCount\"><>(\\w+)"
+ name: "pinot_controller_realtimeTableCount_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ValidationMetrics\",
name=\"pinot.controller.(\\w+)\\.(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_validateion_$2_$3"
+ labels:
+ table: "$1"
+# Pinot Broker
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+).authorization\"><>(\\w+)"
+ name: "pinot_broker_authorization_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.documentsScanned\"><>(\\w+)"
+ name: "pinot_broker_documentsScanned_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.entriesScannedInFilter\"><>(\\w+)"
+ name: "pinot_broker_entriesScannedInFilter_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.entriesScannedPostFilter\"><>(\\w+)"
+ name: "pinot_broker_entriesScannedPostFilter_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.freshnessLagMs\"><>(\\w+)"
+ name: "pinot_broker_freshnessLagMs_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.queries\"><>(\\w+)"
+ name: "pinot_broker_queries_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.queryExecution\"><>(\\w+)"
+ name: "pinot_broker_queryExecution_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.queryRouting\"><>(\\w+)"
+ name: "pinot_broker_queryRouting_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.reduce\"><>(\\w+)"
+ name: "pinot_broker_reduce_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.requestCompilation\"><>(\\w+)"
+ name: "pinot_broker_requestCompilation_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.scatterGather\"><>(\\w+)"
+ name: "pinot_broker_scatterGather_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)\\.totalServerResponseSize\"><>(\\w+)"
+ name: "pinot_broker_totalServerResponseSize_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)_(\\w+).groupBySize\"><>(\\w+)"
+ name: "pinot_broker_groupBySize_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)_(\\w+).noServingHostForSegment\"><>(\\w+)"
+ name: "pinot_broker_noServingHostForSegment_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.healthcheck(\\w+)\"><>(\\w+)"
+ name: "pinot_broker_healthcheck_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.helix.(\\w+)\"><>(\\w+)"
+ name: "pinot_broker_helix_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.helixZookeeper(\\w+)\"><>(\\w+)"
+ name: "pinot_broker_helix_zookeeper_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.nettyConnection(\\w+)\"><>(\\w+)"
+ name: "pinot_broker_nettyConnection_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.clusterChangeCheck\"\"><>(\\w+)"
+ name: "pinot_broker_clusterChangeCheck_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.proactiveClusterChangeCheck\"><>(\\w+)"
+ name: "pinot_broker_proactiveClusterChangeCheck_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.(\\w+)Exceptions\"><>(\\w+)"
+ name: "pinot_broker_exceptions_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\",
name=\"pinot.broker.routingTableUpdateTime\"><>(\\w+)"
+ name: "pinot_broker_routingTableUpdateTime_$1"
+# Pinot Server
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.documentCount.(\\w+)_(\\w+)\"><>(\\w+)"
+ name: "pinot_server_documentCount_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.segmentCount.(\\w+)_(\\w+)\"><>(\\w+)"
+ name: "pinot_server_segmentCount_$3"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.(\\w+)_(\\w+)\\.(\\w+)\"><>(\\w+)"
+ name: "pinot_server_$3_$4"
+ labels:
+ table: "$1"
+ tableType: "$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.(\\w+)_(\\w+)\\-(.+)\\-(\\w+).realtimeRowsConsumed\"><>(\\w+)"
+ name: "pinot_server_realtimeRowsConsumed_$5"
+ labels:
+ table: "$1"
+ tableType: "$2"
+ topic: "$3"
+ partition: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.helix.connected\"><>(\\w+)"
+ name: "pinot_server_helix_connected_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.helixZookeeperReconnects\"><>(\\w+)"
+ name: "pinot_server_helix_zookeeperReconnects_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.highestKafkaOffsetConsumed.(\\w+)_(\\w+)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+ name: "pinot_server_highestKafkaOffsetConsumed_$5"
+ labels:
+ table: "$1"
+ tableType: "$2"
+ topic: "$3"
+ partition: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.highestStreamOffsetConsumed.(\\w+)_(\\w+)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+ name: "pinot_server_highestStreamOffsetConsumed_$5"
+ labels:
+ table: "$1"
+ tableType: "$2"
+ topic: "$3"
+ partition: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.lastRealtimeSegment(\\w+)Seconds.(\\w+)_(\\w+)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+ name: "pinot_server_lastRealtimeSegment$1Seconds_$6"
+ labels:
+ table: "$2"
+ tableType: "$3"
+ topic: "$4"
+ partition: "$5"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.llcControllerResponse(\\w+)\"><>(\\w+)"
+ name: "pinot_server_llcControllerResponse_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.llcPartitionConsuming.(\\w+)_(\\w+)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+ name: "pinot_server_llcPartitionConsuming_$5"
+ labels:
+ table: "$1"
+ tableType: "$2"
+ topic: "$3"
+ partition: "$4"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.llcSimultaneousSegmentBuilds\"><>(\\w+)"
+ name: "pinot_server_llcSimultaneousSegmentBuilds_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.memory.(\\w+)\"><>(\\w+)"
+ name: "pinot_server_memory_$1_$2"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.queries\"><>(\\w+)"
+ name: "pinot_server_queries_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.realtimeConsumptionExceptions\"><>(\\w+)"
+ name: "pinot_server_realtime_consumptionExceptions_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.realtimeOffheapMemoryUsed.(\\w+)\"><>(\\w+)"
+ name: "pinot_server_realtime_offheapMemoryUsed_$2"
+ labels:
+ table: "$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.realtimeOffsetCommits\"><>(\\w+)"
+ name: "pinot_server_realtime_offsetCommits_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.realtimeRowsConsumed\"><>(\\w+)"
+ name: "pinot_server_realtime_rowsConsumed_$1"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\",
name=\"pinot.server.(\\w+)Exceptions\"><>(\\w+)"
+ name: "pinot_server_realtime_exceptions_$1_$2"
+- pattern:
"\"org.apache.pinot.transport.netty.NettyTCPServer_(\\w+)_\"<type=\"\",
name=\"(\\w+)\"><>(\\w+)"
+ name: "pinot_server_netty_tcp_$2_$3"
+ labels:
+ id: "$1"
diff --git
a/docker/images/pinot/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent-0.12.0.jar
b/docker/images/pinot/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent-0.12.0.jar
new file mode 100644
index 0000000..cd7bcd0
Binary files /dev/null and
b/docker/images/pinot/etc/jmx_prometheus_javaagent/jmx_prometheus_javaagent-0.12.0.jar
differ
diff --git a/docker/images/pinot/ingestion-job-specs/airlineStats.yaml
b/docker/images/pinot/examples/docker/ingestion-job-specs/airlineStats.yaml
similarity index 100%
rename from docker/images/pinot/ingestion-job-specs/airlineStats.yaml
rename to
docker/images/pinot/examples/docker/ingestion-job-specs/airlineStats.yaml
diff --git a/docker/images/pinot/ingestion-job-specs/baseballStats.yaml
b/docker/images/pinot/examples/docker/ingestion-job-specs/baseballStats.yaml
similarity index 100%
rename from docker/images/pinot/ingestion-job-specs/baseballStats.yaml
rename to
docker/images/pinot/examples/docker/ingestion-job-specs/baseballStats.yaml
diff --git
a/docker/images/pinot/table-configs/airlineStats_realtime_table_config.json
b/docker/images/pinot/examples/docker/table-configs/airlineStats_realtime_table_config.json
similarity index 100%
rename from
docker/images/pinot/table-configs/airlineStats_realtime_table_config.json
rename to
docker/images/pinot/examples/docker/table-configs/airlineStats_realtime_table_config.json
diff --git
a/docker/images/pinot/table-configs/meetupRsvp_realtime_table_config.json
b/docker/images/pinot/examples/docker/table-configs/meetupRsvp_realtime_table_config.json
similarity index 100%
rename from
docker/images/pinot/table-configs/meetupRsvp_realtime_table_config.json
rename to
docker/images/pinot/examples/docker/table-configs/meetupRsvp_realtime_table_config.json
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
