Renamed job linux>os. Nginx autorestart false.

VERSION

@@ -0,0 +1 @@
+1.0.0

docker-push.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -eu
+
+VER="$(cat VERSION)"
+REV="$(git log -n 1 --no-walk --pretty="%h")"
+DATE="$(TZ="UTC" date "+%Y%m%d")"
+
+docker tag percona/pmm-server percona/pmm-server:"$VER-dev$DATE.$REV"
+docker push percona/pmm-server:"$VER-dev$DATE.$REV"

nginx.conf

@@ -18,10 +18,10 @@ http {
 	error_log /var/log/nginx/error.log;
 	gzip on;
 	server {
-		listen                  *:80;
-		server_name             _;
-		server_tokens           off;
-		root                    /opt/landing-page; 
+		listen			*:80;
+		server_name		_;
+		server_tokens		off;
+		root			/opt/landing-page; 
 
 		# Grafana
 		rewrite				^/graph$ /graph/;
@@ -49,6 +49,13 @@ http {
 		location /qan {
 			alias			/opt/qan-app;
 		}
+
+		# QAN API
+		rewrite				^/qan-api$ /qan-api/;
+		location /qan-api {
+			proxy_pass		http://localhost:9001;
+			rewrite			^/qan-api/(.*) /$1 break;
+		}
 	}
 }
 

prometheus.yml

@@ -13,7 +13,7 @@ scrape_configs:
   - job_name: override 
     consul_sd_configs:
     - server:   'localhost:8500'
-      services: ['linux', 'mongodb']
+      services: ['os', 'mongodb']
 
     relabel_configs:
     - source_labels: ['__meta_consul_service']

supervisord.conf

@@ -35,7 +35,7 @@ priority = 5
 command = nginx
 stdout_logfile = /var/log/nginx.log
 stderr_logfile = /var/log/nginx.log
-autorestart = true
+autorestart = false
 
 [program:cron]
 priority = 6