Merge pull request #147 from max-amb/ha-proxy_addition

Ha proxy addition

grafana_monitoring/readme.md → grafana_monitoring/README.md

@@ -1,11 +1,11 @@
 All required environment variables can be found in env.sh and should be updated before deploying, environment variables are included in compose.yaml and will be copied to the container
 
-#compose.yaml
+# compose.yaml
 Specifies the image, name, and environment variables used when arranging docker
 
-#cloud_datasource.yaml
+# cloud_datasource.yaml
 When grafana see this file it makes connection to the databases specified in this file
 
-#env.sh
+# env.sh
 Stores environment variables which cannot be published onto github
-User should edit and run this script to export the environment variables
+User should edit and run this script to export the environment variables

grafana_monitoring/compose.yaml

@@ -26,3 +26,18 @@ services:
     volumes:
       - ./cloud_datasource.yaml:/etc/grafana/provisioning/datasources/cloud_datasource.yaml
       - ./cloud-grafana-dashboards/:/etc/grafana/provisioning/dashboards
+    networks:
+      - backend
+
+  haproxy:
+    image: haproxytech/haproxy-alpine:2.4
+    networks:
+      - backend
+    ports:
+      - 80:80
+      - 443:443
+    volumes:
+      - ./haproxy.cfg:/etc/haproxy/haproxy.cfg
+
+networks:
+  backend:

grafana_monitoring/haproxy.cfg

@@ -0,0 +1,20 @@
+global
+  stats socket /var/run/api.sock user haproxy group haproxy mode 660 level admin expose-fd listeners
+  log stdout format raw local0 info
+
+defaults
+  mode http
+  timeout client 10s
+  timeout connect 5s
+  timeout server 10s
+  timeout http-request 10s
+  log global
+
+frontend myfrontend
+  bind :80
+  bind :443 ssl crt /etc/haproxy/grafana.crt
+  http-request redirect scheme https unless { ssl_fc }
+  default_backend webservers
+
+backend webservers
+  server grafana-server grafana-instance:3000 check