diff --git a/TP6 log.txt b/TP6 log.txt
index af25b7cbe16bc1a70aa47d30f9919a627f57abe2..7829036b73d0afc5bc23663001b88838459b8acc 100644
--- a/TP6 log.txt	
+++ b/TP6 log.txt	
@@ -1,2 +1,14 @@
 TP6 (13.11.2020)
-Monitoring
\ No newline at end of file
+Monitoring
+
+Prometheus permet de faire du monitoring sur toutes les containers docker sur une seule machine et même machine. 
+Il est donc impossible de surveiller le container d'une machine différente.
+(https://phoenixnap.com/blog/docker-container-monitoring-tools)
+Pour installer prometheus, j'ai du créer un fichier prometheus.yml avec le contenu suivant 
+
+scrape_configs:
+- job_name: nginx_survey
+  scrape_interval: 5s
+  static_configs:
+  - targets:
+    - 172.28.100.90:9090
\ No newline at end of file
diff --git a/TP6_19.11.20/ansible/Dockerfile b/TP6_19.11.20/ansible/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..734686c86038ae9b3c5494eb73b0808f0dc768e6
--- /dev/null
+++ b/TP6_19.11.20/ansible/Dockerfile
@@ -0,0 +1,3 @@
+FROM prom/prometheus:latest
+RUN rm /etc/prometheus/prometheus.yml
+COPY prometheus.yml /etc/prometheus/
\ No newline at end of file
diff --git a/TP6_19.11.20/ansible/prometheus.yml b/TP6_19.11.20/ansible/prometheus.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cb786135e62dc5f6e46d091cad624271cf428765
--- /dev/null
+++ b/TP6_19.11.20/ansible/prometheus.yml
@@ -0,0 +1,20 @@
+# scrape_configs:
+# - job_name: nginxAndWorkers
+#   # Override the global default and scrape targets from this job every 5 seconds.
+#   scrape_interval: 5s
+
+#   static_configs:
+#     - targets: ['172.28.100.90:8000', '172.28.100.51:8000', '172.28.100.111:8000', '172.28.100.72:8000']
+#       labels:
+#         group: 'workers'
+
+#     - targets: ['172.28.100.90:9090']
+#       labels:
+#         group: 'reverse_proxy'
+
+scrape_configs:
+- job_name: cadvisor
+  scrape_interval: 5s
+  static_configs:
+  - targets:
+    - cadvisor:8080
\ No newline at end of file
diff --git a/TP6_19.11.20/ansible/test/docker-compose.yml b/TP6_19.11.20/ansible/test/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..46eb4b872e38fc3f365c70f14c51b65af517f6c2
--- /dev/null
+++ b/TP6_19.11.20/ansible/test/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '3.4'
+services:
+  prometheus:
+    image: 'prom/prometheus:latest'
+    container_name: prometheus
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+    ports:
+      - '9090:9090'
+  cadvisor:
+    image: 'google/cadvisor:latest'
+    container_name: cadvisor
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:ro
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /dev/disk:/dev/disk/:ro
+    ports:
+    - '8080:8080'
\ No newline at end of file
diff --git a/TP6_19.11.20/ansible/test/prometheus.yml b/TP6_19.11.20/ansible/test/prometheus.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f5f9df7352791c1f81ea11ec7cc3d02be7ec0a51
--- /dev/null
+++ b/TP6_19.11.20/ansible/test/prometheus.yml
@@ -0,0 +1,19 @@
+global:
+  scrape_interval: 15s
+  evaluation_interval: 15s
+alerting:
+  alertmanagers:
+  - static_configs:
+    - targets:
+    # whatever you want
+scrape_configs:
+  - job_name: 'prometheus'
+    static_configs:
+    - targets: ['prometheus:9090']
+      labels:
+        alias: 'prometheus'
+  - job_name: 'cadvisor'
+    static_configs:
+    - targets: ['cadvisor:8080']
+      labels:
+        alias: 'cadvisor'
\ No newline at end of file