Xinfra Monitor Rebranding Migration Continuation Part III Signed-off-…

…by: Andrew Choi <[email protected]> Xinfra Monitor Rebranding Migration Continuation Part III Signed-off-by: Andrew Choi <[email protected]>
linkedin · Jun 3, 2020 · 9b15dc0 · 9b15dc0
1 parent d9634a9
commit 9b15dc0
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ jdk: oraclejdk8
 
 env:
   global:
-    # these secure values are encrypted for linkedin/kafka-monitor. for use in forked repos, set env vars in your own build - they should win over these (as these wont be decodable in forked builds)
+    # these secure values are encrypted for linkedin/xinfra-monitor. for use in forked repos, set env vars in your own build - they should win over these (as these wont be decodable in forked builds)
     - secure: ghCdYRfSGI7BtA0rB0UfzEJWszKwvnSy1Y0LBSWn3wdo3e0ibHdofwfeQ5YAczXun+RpGvaUwJRgkSDOsL6DFF8N2hODNkzR+DFNRJv5CFOYuCPJZwPpw/Sr7blCkpZleWmJBW7sqRPa7Yyu5/QpdezRM4tHP/RCxjr9IKgQwOknYyVGUf81Wa3Y+MF5iqR434WItfFpHR7uU5sis592iR4aKS4bcEQ9DCqcrCsrr3RFAft6aM5NZjAhO7tXe3vu5IrtqbB/MFNLrnRO0T6kXcifVqVrHQ/ePzl2iyPIdKygiDgK9VOYg6TfT5maHLwoCK511qnhMlitsy/0qx8CsF33rS0hXS5+EDSJ3qoB38Rqgi2K08uGjWgwwXtUg+2CkyEDA2gpEDIELQSFvG0WEHmAim9Azfxiiyx+HwNJ0zkKeOPUXU3uLDeOGXsUB6vxqjrWvAGtUqCZ5g2qEI8geGH3Zopmg9j665FywawV0OAehj4I2Tn0rBDORbIsu3XWgcZIbq/D8sb4Xhb65CB4wSvcco5g25zQzXruDk6MjB76bthtnIbO9hvIVwADxx2MdWXOX873ApjRoffGtRev+ugfEZCEuWxBvtgJ2owCSdTOm8TIjAwjsc4eBuLqEWQplwnoGhRA12zch4t/itOGv0ABoT9/tVjhiLwtTzmHTFc=
     - secure: I88NyZbbsV4j5a14k1ModOLsQygs7cXjCY98QQcQNRV0FKvvk/ka7xEvwiOFPWFOFy7TUf9O2VjNA8M4oWGqop9MwYNysAccuX6y/VMAldOPlQ23PG7C+Tr44u2YgvbJCdjtmpVKh842yrU8nlHcfLKBGMaqRxjBg4kHNr0lyTGIU83UBsU26yFiUBuE0EwdWXcrlX+ZvfS523BezquWnFW+75R4z2e0i++/vGqKnlBsqXzzxR61aFnYuSN0CDj+XbG1hsc1dcNJbjLVfO8zOSd25oDYVEX+dfBEfD+4LL/3YSjM8EJvUZGghiaDR+K9nm26B+nfvWNOWH8PuqM94t65vueQ4qcUIUXqwhbIf5GixHGTOIj7QOjckPHZ4N4hYkpYMLwPRO+I5VuBEKlboCN90c3+OEEsBSUXSH/JIBI8mmiwkegPV89HtSRntFGFqYtL7Wg/GyJV7DCQSsacJDaM9ErX2z1sUd++QAQA18qdk1Ngl2hnBOWmTgmtefMo9u15iCxDZr+iMeeTA0IvsupyXeO6hN9xFuwRuXD/q40RIYcOgqFeYR9e/pRJ1A29PE4N6uqDe/JBA8oQFH0jCFbO2oEpVJlX9qgp29wWLSvm/93LRK3f8RLt8ZT1BVNEUnRqtkprbDVp2QlN/7fOz9MI9a00SAXv+siaz3oK++k=
 

diff --git a/README.md b/README.md
@@ -45,8 +45,8 @@ Xinfra Monitor supports Apache Kafka 0.8 to 2.0:
 
 <ol>
 <li> We advise advanced users to run Xinfra Monitor with
-<code>./bin/kafka-monitor-start.sh config/kafka-monitor.properties</code>. The default
-kafka-monitor.properties in the repo provides an simple example of how to
+<code>./bin/kafka-monitor-start.sh config/xinfra-monitor.properties</code>. The default
+xinfra-monitor.properties in the repo provides an simple example of how to
 monitor a single cluster. You probably need to change the value of
 <code>zookeeper.connect</code> and <code>bootstrap.servers</code> to point to your cluster.
   </li>
@@ -55,7 +55,7 @@ monitor a single cluster. You probably need to change the value of
 Config class for respective service, e.g. ProduceServiceConfig.java and
 ConsumeServiceConfig.java.</li>
 <br />
-<li> You can specify multiple SingleClusterMonitor in the kafka-monitor.properties to
+<li> You can specify multiple SingleClusterMonitor in the xinfra-monitor.properties to
 monitor multiple Kafka clusters in one Xinfra Monitor process. As another
 advanced use-case, you can point ProduceService and ConsumeService to two different Kafka clusters that are connected by MirrorMaker to monitor their end-to-end latency.</li>
 <br />  
@@ -92,16 +92,16 @@ $ ./gradlew jar
 
 ### Start XinfraMonitor to run tests/services specified in the config file
 ```
-$ ./bin/kafka-monitor-start.sh config/kafka-monitor.properties
+$ ./bin/kafka-monitor-start.sh config/xinfra-monitor.properties
 ```
 
 ### Run Xinfra Monitor with arbitrary producer/consumer configuration (e.g. SASL enabled client)
-Edit `config/kafka-monitor.properties` to specify custom configurations for producer in the key/value map `produce.producer.props` in
-`config/kafka-monitor.properties`. Similarly specify configurations for
+Edit `config/xinfra-monitor.properties` to specify custom configurations for producer in the key/value map `produce.producer.props` in
+`config/xinfra-monitor.properties`. Similarly specify configurations for
 consumer as well. The documentation for producer and consumer in the key/value maps can be found in the Apache Kafka wiki.
 
 ```
-$ ./bin/kafka-monitor-start.sh config/kafka-monitor.properties
+$ ./bin/kafka-monitor-start.sh config/xinfra-monitor.properties
 ```
 
 ### Run SingleClusterMonitor app to monitor kafka cluster

diff --git a/bin/windows/kafka-monitor-start.bat b/bin/windows/kafka-monitor-start.bat
@@ -15,7 +15,7 @@ popd
 
 
 IF [%1] EQU [] (
-	echo USAGE: %0 config/kafka-monitor.properties
+	echo USAGE: %0 config/xinfra-monitor.properties
 	EXIT /B 1
 )
 

diff --git a/bin/windows/kmf-run-class.bat b/bin/windows/kmf-run-class.bat
@@ -10,12 +10,12 @@ REM an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either expre
 setlocal enabledelayedexpansion
 
 IF [%1] EQU [] (
-	echo USAGE: %0 com.linkedin.kmf.XinfraMonitor config/kafka-monitor.properties
+	echo USAGE: %0 com.linkedin.kmf.XinfraMonitor config/xinfra-monitor.properties
 	EXIT /B 1
 )
 
 IF [%2] EQU [] (
-	echo USAGE: %0 %1 config/kafka-monitor.properties
+	echo USAGE: %0 %1 config/xinfra-monitor.properties
 	EXIT /B 1
 )
 

diff --git a/bin/kafka-monitor-start.sh → bin/xinfra-monitor-start.sh b/bin/kafka-monitor-start.sh → bin/xinfra-monitor-start.sh
diff --git a/config/kafka-monitor.properties → config/xinfra-monitor.properties b/config/kafka-monitor.properties → config/xinfra-monitor.properties
@@ -45,7 +45,7 @@
 {
   "single-cluster-monitor": {
     "class.name": "com.linkedin.kmf.apps.SingleClusterMonitor",
-    "topic": "kafka-monitor-topic",
+    "topic": "xinfra-monitor-topic",
     "zookeeper.connect": "localhost:2181",
     "bootstrap.servers": "localhost:9092",
     "request.timeout.ms": 9000,
@@ -104,7 +104,7 @@
 #  Example produce-service to produce messages to cluster
 #    "produce-service": {
 #        "class.name": "com.linkedin.kmf.services.ProduceService",
-#        "topic": "kafka-monitor-topic",
+#        "topic": "xinfra-monitor-topic",
 #        "zookeeper.connect": "localhost:2181",
 #        "bootstrap.servers": "localhost:9092",
 #        "consume.latency.sla.ms": "20000",
@@ -115,7 +115,7 @@
 #  Example consume-service to consume messages
 #    "consume-service": {
 #        "class.name": "com.linkedin.kmf.services.ConsumeService",
-#        "topic": "kafka-monitor-topic",
+#        "topic": "xinfra-monitor-topic",
 #        "zookeeper.connect": "localhost:2181",
 #        "bootstrap.servers": "localhost:9092",
 #        "consume.latency.sla.ms": "20000",
@@ -143,7 +143,7 @@
 #    "report.interval.sec": 3,
 #    "zookeeper.connect": "localhost:2181",
 #    "bootstrap.servers": "localhost:9092",
-#    "topic": "kafka-monitor-topic-metrics",
+#    "topic": "xinfra-monitor-topic-metrics",
 #    "report.kafka.topic.replication.factor": 1,
 #    "report.metrics.list": [
 #      "kmf.services:type=produce-service,name=*:produce-availability-avg",

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -19,7 +19,7 @@ WORKDIR /opt/kafka-monitor
 ADD build/ build/
 ADD bin/kafka-monitor-start.sh bin/kafka-monitor-start.sh
 ADD bin/kmf-run-class.sh bin/kmf-run-class.sh
-ADD config/kafka-monitor.properties config/kafka-monitor.properties
+ADD config/xinfra-monitor.properties config/xinfra-monitor.properties
 ADD config/log4j2.properties config/log4j2.properties
 ADD docker/kafka-monitor-docker-entry.sh kafka-monitor-docker-entry.sh
 ADD webapp/ webapp/

diff --git a/docker/kafka-monitor-docker-entry.sh b/docker/kafka-monitor-docker-entry.sh
@@ -22,6 +22,6 @@ trap 'pkill java; exit 143' SIGTERM
 #  wait for DNS services to be available
 sleep 10
 
-bin/kafka-monitor-start.sh config/kafka-monitor.properties &
+bin/xinfra-monitor-start.sh config/xinfra-monitor.properties &
 
 wait $!
diff --git a/src/main/java/com/linkedin/kmf/XinfraMonitor.java b/src/main/java/com/linkedin/kmf/XinfraMonitor.java
@@ -168,7 +168,7 @@ public void awaitShutdown() {
   @SuppressWarnings("rawtypes")
   public static void main(String[] args) throws Exception {
     if (args.length <= 0) {
-      LOG.info("USAGE: java [options] " + XinfraMonitor.class.getName() + " config/kafka-monitor.properties");
+      LOG.info("USAGE: java [options] " + XinfraMonitor.class.getName() + " config/xinfra-monitor.properties");
       return;
     }
 

diff --git a/src/main/java/com/linkedin/kmf/services/configs/StatsdMetricsReporterServiceConfig.java b/src/main/java/com/linkedin/kmf/services/configs/StatsdMetricsReporterServiceConfig.java
@@ -8,7 +8,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *
  *
- * In order to enable the StatsD metrics export, add the following section to kafka-monitor.properties file
+ * In order to enable the StatsD metrics export, add the following section to xinfra-monitor.properties file
  *
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
      * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      *
      *
-     * In order to enable the StatsD metrics export, add the following section to kafka-monitor.properties file
+     * In order to enable the StatsD metrics export, add the following section to xinfra-monitor.properties file
      *
      */
@@ Expand Down @@