Improving hygiene around Jmx Exporter code

COPYRIGHT.txt

@@ -1,3 +1,3 @@
 DataStax Diagnostic Collector
-Copyright (c) 2011-  DataStax
+Copyright (c) 2011-  DataStax, Inc.
 

LICENSE.txt

@@ -1,4 +1,5 @@
 
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -200,3 +201,20 @@
    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.
+
+
+   ====================================================================
+
+   This product includes subcomponents with separate copyright notices and
+   license terms. Your use of these subcomponents is subject to the terms
+   and conditions of the following licenses.
+
+   This product bundles the JmxScraper from Prometheus' jmx_exporter,
+   Copyright The Prometheus Authors, and made available under
+   the Apache 2.0 License. https://github.com/prometheus/jmx_exporter
+
+   This product bundles the original SDTAT tool,
+   Copyright Dag Wieers, and made available under
+   the GPL-2.0 license. https://github.com/dstat-real/dstat
+
+

Makefile

@@ -12,8 +12,8 @@ collector: check-env generate-key
 	@rm -f collector/collector.conf
 	@mv collector/collector.hosts.in collector/collector.hosts
 	@mv collector/collector.conf.in collector/collector.conf
-	@od -An -vtx1 collector/collector-0.11.1-SNAPSHOT.jar > collector/collector-0.11.1-SNAPSHOT.txt
-	@rm collector/collector-0.11.1-SNAPSHOT.jar
+	@od -An -vtx1 collector/collector-0.17.2.jar > collector/collector-0.17.2.txt
+	@rm collector/collector-0.17.2.jar
 	@sed -i.bak 's/\#issueId=.*/issueId=\"$(subst /,-,$(ISSUE))\"/' collector/collector.conf
 ifdef COLLECTOR_S3_BUCKET
 	@sed -i.bak 's/bucket=.*/bucket=${COLLECTOR_S3_BUCKET}/' collector/ds-collector

ds-collector/README.md

@@ -154,7 +154,7 @@ cd /tmp/
 tar -xvf <path-to-bundle>/<bundle>.tar.gz
 mv collector datastax
 cd datastax
-wget https://github.com/datastax/diagnostic-collection/raw/master/ds-collector/collector-0.11.1-SNAPSHOT.jar
+wget https://github.com/datastax/diagnostic-collection/raw/master/ds-collector/collector-0.17.2.jar
 # edit collector.conf, then run the ds-collector in client-mode
 ./ds-collector -C -f collector.conf 
 # if the node has internet access, upload directly to s3

ds-collector/TROUBLESHOOTING.md

@@ -202,7 +202,7 @@ Other command-line arguments are needed:
 The `xxd` utility is used to convert a text file included with the collector into a `.jar` file that can be used to process metrics.
 
 ### What to do:
-You can install the `xxd` utility on the platform (e.g. it is stand-alone package in Ubuntu, included as part of `vim-common` on RHEL). Alternately, you can download the compiled `.jar` file into the same folder on the Bastion as you have unpacked the `ds-collector` script. The `.jar` can be downloaded from [https://github.com/datastax/diagnostic-collection/raw/master/ds-collector/collector-0.11.1-SNAPSHOT.jar](https://github.com/datastax/diagnostic-collection/raw/master/ds-collector/collector-0.11.1-SNAPSHOT.jar).
+You can install the `xxd` utility on the platform (e.g. it is stand-alone package in Ubuntu, included as part of `vim-common` on RHEL). Alternately, you can download the compiled `.jar` file into the same folder on the Bastion as you have unpacked the `ds-collector` script. The `.jar` can be downloaded from [https://github.com/datastax/diagnostic-collection/raw/master/ds-collector/collector-0.17.2.jar](https://github.com/datastax/diagnostic-collection/raw/master/ds-collector/collector-0.17.2.jar).
 
 
 ## Error Involving `cpReadable.sh`

ds-collector/ds-collector

@@ -1068,7 +1068,7 @@ FOREGROUND_OPT="--foreground"
 # It's built from the jmx_exporter/collector
 # it used to be a standalone tool
 
-prometheus="collector-0.11.1-SNAPSHOT.jar"
+prometheus="collector-0.17.2.jar"
 
 dstat="dstat"