Fixes #26

Author: vfarcic

prometheus/config.go

@@ -79,7 +79,7 @@ func (c *Config) InsertAlertManagerURL(alertURL string) error {
 	amc := &AlertmanagerConfig{
 		Scheme: url.Scheme,
 		ServiceDiscoveryConfig: ServiceDiscoveryConfig{
-			StaticConfigs: []*TargetGroup{&TargetGroup{
+			StaticConfigs: []*TargetGroup{{
 				Targets: []string{url.Host},
 			}},
 		},
@@ -101,7 +101,7 @@ func (c *Config) InsertScrapes(scrapes map[string]Scrape) {
 		if s.ScrapeType == "static_configs" {
 			newScrape = &ScrapeConfig{
 				ServiceDiscoveryConfig: ServiceDiscoveryConfig{
-					StaticConfigs: []*TargetGroup{&TargetGroup{
+					StaticConfigs: []*TargetGroup{{
 						Targets: []string{fmt.Sprintf("%s:%d", s.ServiceName, s.ScrapePort)},
 					}},
 				},
@@ -111,7 +111,7 @@ func (c *Config) InsertScrapes(scrapes map[string]Scrape) {
 		} else {
 			newScrape = &ScrapeConfig{
 				ServiceDiscoveryConfig: ServiceDiscoveryConfig{
-					DNSSDConfigs: []*DNSSDConfig{&DNSSDConfig{
+					DNSSDConfigs: []*DNSSDConfig{{
 						Names: []string{fmt.Sprintf("tasks.%s", s.ServiceName)},
 						Port:  s.ScrapePort,
 						Type:  "A",
@@ -138,7 +138,7 @@ func (c *Config) InsertScrapesFromDir(dir string) {
 			if content, err := afero.ReadFile(FS, dir+file.Name()); err == nil {
 				sc := []*ScrapeConfig{}
 
-				// Trim for backwards compability
+				// Trim for backwards compatibility
 				content = normalizeScrapeFile(content)
 				err := yaml.Unmarshal(content, &sc)
 				if err != nil {

stack.yml

@@ -8,7 +8,6 @@ services:
       - proxy
       - monitor
     environment:
-      - ARG_STORAGE_LOCAL_PATH=/data
       - ARG_WEB_EXTERNAL-URL=http://prometheus.dockerflow.com
       - LISTENER_ADDRESS=swarm-listener
       - ARG_ALERTMANAGER_URL=http://alert-manager:9093
@@ -28,9 +27,9 @@ services:
         - com.df.alertFor=30s
       resources:
         reservations:
-          memory: 2500M
+          memory: 1750M
         limits:
-          memory: 3500M
+          memory: 2250M
 
   alert-manager:
     image: prom/alertmanager
@@ -84,21 +83,21 @@ services:
         limits:
           memory: 20M
 
-  grafana:
-    image: grafana/grafana:${GRAFANA_TAG:-4.6.0}
-    networks:
-      - infra_default
-      - monitor
-    environment:
-#      - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/grafana/
-      - GF_SECURITY_ADMIN_USER=${GF_USER:-admin}
-      - GF_SECURITY_ADMIN_PASSWORD=${GF_PASS:-admin}
-    deploy:
-      labels:
-        - com.df.notify=true
-        - com.df.distribute=true
-        - com.df.serviceDomain=grafana.dockerflow.com
-        - com.df.port=3000
+#   grafana:
+#     image: grafana/grafana:${GRAFANA_TAG:-4.6.0}
+#     networks:
+#       - infra_default
+#       - monitor
+#     environment:
+# #      - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/grafana/
+#       - GF_SECURITY_ADMIN_USER=${GF_USER:-admin}
+#       - GF_SECURITY_ADMIN_PASSWORD=${GF_PASS:-admin}
+#     deploy:
+#       labels:
+#         - com.df.notify=true
+#         - com.df.distribute=true
+#         - com.df.serviceDomain=grafana.dockerflow.com
+#         - com.df.port=3000
 
   cadvisor:
     image: google/cadvisor:${CADVISOR_TAG:-latest}

stacks/docker-flow-monitor-aws.yml

@@ -5,14 +5,14 @@ services:
   monitor:
     image: vfarcic/docker-flow-monitor
     environment:
-      - ARG_STORAGE_LOCAL_PATH=/data
+      - ARG_STORAGE_TSDB_PATH=/prometheus
       - LISTENER_ADDRESS=swarm-listener
       - GLOBAL_SCRAPE_INTERVAL=${SCRAPE_INTERVAL:-10s}
       - ARG_WEB_ROUTE-PREFIX=/monitor
       - ARG_WEB_EXTERNAL-URL=http://${DOMAIN:-localhost}/monitor
       - ARG_ALERTMANAGER_URL=http://alert-manager:9093
     volumes:
-      - prom:/data
+      - prom:/prometheus
     networks:
       - proxy
       - monitor