MongoDB related changes.

CHANGELOG.md

@@ -1,13 +1,16 @@
 Percona Monitoring and Management (PMM) Server
 
-v1.0.6 unreleased 2016-10-19
+v1.0.6 unreleased 2016-10-28
 
 * Prometheus 1.2.1.
 * Added "Amazon RDS OS Metrics" dashboard and CloudWatch datasource.
 * Added PMM Server to metrics monitoring: the underlying host appears on system and disk dashboards as "pmm-server".
 * Query analytics data is now purged correctly: it was broken in 1.0.5 and keeping retention 1 day in 1.0.4.
 * Query analytics data retention is made configurable with `QUERIES_RETENTION` option. Default: 8 days.
 * Made the external static files local for PMM home page.
+* Improvements and fixes to Query Analytics.
+* Refactored MongoDB dashboards.
+* Added "File Descriptors" graph to System Overview dashboard.
 
 v1.0.5 released 2016-10-14
 

Dockerfile

@@ -31,10 +31,9 @@ COPY import-dashboards.py grafana-postinstall.sh VERSION /opt/
 RUN curl -s -LO https://grafanarel.s3.amazonaws.com/builds/grafana_3.1.1-1470047149_amd64.deb && \
 	dpkg -i grafana_3.1.1-1470047149_amd64.deb && \
 	git clone https://github.com/percona/grafana-dashboards.git && \
-	git clone -b alias2instance https://github.com/roman-vynar/grafana_mongodb_dashboards.git && \
 	/opt/grafana-postinstall.sh && \
 	cp /opt/VERSION /var/lib/grafana/ && \
-	rm -rf grafana_3.1.1-1470047149_amd64.deb grafana-dashboards/.git grafana_mongodb_dashboards/.git
+	rm -rf grafana_3.1.1-1470047149_amd64.deb grafana-dashboards/.git
 
 # ###### #
 # Consul #
@@ -73,16 +72,16 @@ COPY landing-page/ /opt/landing-page/
 # ####################### #
 COPY purge-qan-data /etc/cron.daily/
 COPY qan-install.sh /opt/
-ADD https://www.percona.com/downloads/TESTING/pmm/percona-qan-api-1.0.5-x86_64.tar.gz \
-    https://www.percona.com/downloads/TESTING/pmm/percona-qan-app-1.0.5.tar.gz \
+ADD https://www.percona.com/downloads/TESTING/pmm/percona-qan-api-1.0.6-20161024.2cbdd01-x86_64.tar.gz \
+    https://www.percona.com/downloads/TESTING/pmm/percona-qan-app-1.0.6-20161024.6d92a38.tar.gz \
     /opt/
 RUN curl -s -L -o /usr/bin/pt-archiver https://raw.githubusercontent.com/percona/percona-toolkit/2.2/bin/pt-archiver && \
 	chmod 755 /usr/bin/pt-archiver && \
 	mkdir qan-api qan-app && \
-	tar zxf percona-qan-api-1.0.5-x86_64.tar.gz --strip-components=1 -C qan-api && \
-	tar zxf percona-qan-app-1.0.5.tar.gz --strip-components=1 -C qan-app && \
+	tar zxf percona-qan-api-1.0.6-20161024.2cbdd01-x86_64.tar.gz --strip-components=1 -C qan-api && \
+	tar zxf percona-qan-app-1.0.6-20161024.6d92a38.tar.gz --strip-components=1 -C qan-app && \
 	/opt/qan-install.sh && \
-	rm -rf percona-qan-api-1.0.5-x86_64.tar.gz percona-qan-app-1.0.5.tar.gz qan-api
+	rm -rf percona-qan-api-1.0.6-20161024.2cbdd01-x86_64.tar.gz percona-qan-app-1.0.6-20161024.6d92a38.tar.gz qan-api
 
 # ##### #
 # Start #

import-dashboards.py

@@ -10,7 +10,7 @@
 import sys
 import time
 
-DIRS = ['/opt/grafana-dashboards/dashboards/', '/opt/grafana_mongodb_dashboards/dashboards/']
+DIR = '/opt/grafana-dashboards/dashboards/'
 
 
 def main():
@@ -72,12 +72,11 @@ def main():
 
     # Import dashboards with overwrite.
     files = []
-    for d in DIRS:
-        for f in os.listdir(d):
-            if not f.endswith('.json'):
-                continue
+    for f in os.listdir(DIR):
+        if not f.endswith('.json'):
+            continue
 
-            files.append(d + f)
+        files.append(DIR + f)
 
     for file_ in files:
         print file_

prometheus.yml

@@ -54,18 +54,10 @@ scrape_configs:
       regex:         '.*,alias_([-\w:\.]+),.*'
       target_label:  'instance'
       replacement:   '$1'
-    - source_labels: ['__meta_consul_tags']
-      regex:         '.*,replset_([-\w:\.]+),.*'
-      target_label:  'replset'
-      replacement:   '$1'
     - source_labels: ['__meta_consul_tags']
       regex:         '.*,cluster_([-\w:\.]+),.*'
       target_label:  'cluster'
       replacement:   '$1'
-    - source_labels: ['__meta_consul_tags']
-      regex:         '.*,nodetype_([-\w:\.]+),.*'
-      target_label:  'nodetype'
-      replacement:   '$1'
 
 
   - job_name: mysql-hr