From f7cc744eb276625fb4e6d71128e325f8441632cb Mon Sep 17 00:00:00 2001
From: Brian Christner <brian.christner@gmail.com>
Date: Tue, 17 Nov 2015 16:24:31 +0100
Subject: [PATCH 1/2] Update docker-compose.yml

Updated the docker-compose file container variables.  It appears the docker-compose configuration option container_name changed to name in the latest version of docker-compose.
---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4e39d7d..947d896 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ prometheus:
   build: "prom/"
   ports:
     - "9090:9090"
-  container_name: prometheus
+  name: prometheus
   links:
     - "exporter:export"
     - "cadvisor:cad"
@@ -16,7 +16,7 @@ exporter:
     - "9104:9104"
   expose:
     - "9104"
-  container_name: exporter
+  name: exporter
 
 sqlite3:
   image: "prom/promdash"
@@ -37,7 +37,7 @@ promdash:
     - /tmp/prom:/tmp/prom
   environment:
     - "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3"
-  container_name: promdash
+  name: promdash
 
 cadvisor:
   image: "google/cadvisor"
@@ -50,4 +50,4 @@ cadvisor:
     - "8080:8080"
   expose:
     - "8080"
-  container_name: cadvisor
+  name: cadvisor

From 8fd61f32ac17388fe8505e41ddbd2fb91babe945 Mon Sep 17 00:00:00 2001
From: Brian Christner <brian.christner@gmail.com>
Date: Tue, 17 Nov 2015 16:44:48 +0100
Subject: [PATCH 2/2] Update prometheus.yml

updated Prometheus file updated config
---
 prom/prometheus.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/prom/prometheus.yml b/prom/prometheus.yml
index 92af058..fd25e86 100644
--- a/prom/prometheus.yml
+++ b/prom/prometheus.yml
@@ -4,8 +4,9 @@ global:
   evaluation_interval: 15s # By default, scrape targets every 15 seconds.
   # scrape_timeout is set to the global default (10s).
 
-  # Attach these extra labels to all timeseries collected by this Prometheus instance.
-  labels:
+  # Attach these labels to any time series or alerts when communicating with
+  # external systems (federation, remote storage, Alertmanager).
+  external_labels:
       monitor: 'codelab-monitor'
 
 # Load and evaluate rules in this file every 'evaluation_interval' seconds.
@@ -13,7 +14,7 @@ rule_files:
   # - "first.rules"
   # - "second.rules"
 
-# A scrape configuration containing exactly one endpoint to scrape: 
+# A scrape configuration containing exactly one endpoint to scrape:
 # Here it's Prometheus itself.
 scrape_configs:
   # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.