diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index aace4e827..871b0a16a 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -57,6 +57,31 @@ append_so-influxdb_so-status.conf:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-influxdb
 
+set_autogen_retention_policy:
+  influxdb_retention_policy.present:
+    - name: autogen
+    - database: telegraf
+    - duration: 1h
+    - replication: 1
+    - default: True
+    - ssl: True
+    - unsafeSsl: True
+    - require:
+      - docker_container: so-influxdb
+
+set_so_long_term_retention_policy:
+  influxdb_retention_policy.present:
+    - name: so_long_term
+    - database: telegraf
+    - duration: 2h
+    - replication: 1
+    - default: False
+    - ssl: True
+    - unsafeSsl: True
+    - require:
+      - docker_container: so-influxdb
+
+
 {% endif %}
 
 {% else %}
@@ -66,3 +91,10 @@ append_so-influxdb_so-status.conf:
     - name: {{sls}}_state_not_allowed
 
 {% endif %}
+
+#influxdb:
+#  retention_policies:
+#    autogen:
+#      duration: 1h
+#    so_long_term:
+#      duration: 2h
\ No newline at end of file
diff --git a/setup/so-functions b/setup/so-functions
index 21602f320..5890f4726 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2022,6 +2022,7 @@ saltify() {
 				set_progress_str 7 'Installing salt-master'
 				retry 50 10 "apt-get -y install salt-master=3002.5+ds-1" >> "$setup_log" 2>&1 || exit 1
 				retry 50 10 "apt-mark hold salt-master" >> "$setup_log" 2>&1 || exit 1
+				retry 50 10 "pip3 install --user influxdb" >> "$setup_log" 2>&1 || exit 1
 				;;
 			*)
 				# Copy down the gpg keys and install them from the manager
@@ -2041,7 +2042,7 @@ saltify() {
 		retry 50 10 "apt-get -y install salt-minion=3002.5+ds-1 salt-common=3002.5+ds-1" >> "$setup_log" 2>&1 || exit 1
 		retry 50 10 "apt-mark hold salt-minion salt-common" >> "$setup_log" 2>&1 || exit 1
 		if [[ $OSVER != 'xenial' ]]; then
-			retry 50 10 "apt-get -y install python3-pip python3-dateutil python3-m2crypto python3-mysqldb" >> "$setup_log" 2>&1 || exit 1
+			retry 50 10 "apt-get -y install python3-pip python3-dateutil python3-m2crypto python3-mysqldb python3-influxdb" >> "$setup_log" 2>&1 || exit 1
 		else
 			retry 50 10 "apt-get -y install python-pip python-dateutil python-m2crypto python-mysqldb"  >> "$setup_log" 2>&1 || exit 1
 		fi