diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 404a8a9..4c83dc5 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -2,6 +2,8 @@
 - salt
 - git
 - openssh
+classes:
+- service.salt.support
 parameters:
   salt:
     master:
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 58f437e..a0033f9 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -2,6 +2,8 @@
 - salt
 - git
 - openssh
+classes:
+- service.salt.support
 parameters:
   _param:
     salt_master_base_environment: dev
diff --git a/metadata/service/minion/cluster.yml b/metadata/service/minion/cluster.yml
index fbb64dc..c578635 100644
--- a/metadata/service/minion/cluster.yml
+++ b/metadata/service/minion/cluster.yml
@@ -1,5 +1,7 @@
 applications:
 - salt
+classes:
+- service.salt.support
 parameters:
   salt:
     minion:
diff --git a/metadata/service/minion/local.yml b/metadata/service/minion/local.yml
index 6739f17..74e956f 100644
--- a/metadata/service/minion/local.yml
+++ b/metadata/service/minion/local.yml
@@ -1,5 +1,7 @@
 applications:
 - salt
+classes:
+- service.salt.support
 parameters:
   salt:
     minion:
diff --git a/metadata/service/minion/master.yml b/metadata/service/minion/master.yml
index fbb64dc..c578635 100644
--- a/metadata/service/minion/master.yml
+++ b/metadata/service/minion/master.yml
@@ -1,5 +1,7 @@
 applications:
 - salt
+classes:
+- service.salt.support
 parameters:
   salt:
     minion:
diff --git a/metadata/support.yml b/metadata/support.yml
new file mode 100644
index 0000000..676bced
--- /dev/null
+++ b/metadata/support.yml
@@ -0,0 +1,11 @@
+parameters:
+  salt:
+    _support:
+      collectd:
+        enabled: false
+      heka:
+        enabled: false
+      sensu:
+        enabled: true
+      sphinx:
+        enabled: true
diff --git a/salt/meta/sensu.yml b/salt/meta/sensu.yml
new file mode 100644
index 0000000..8b2ea59
--- /dev/null
+++ b/salt/meta/sensu.yml
@@ -0,0 +1,12 @@
+local_salt_master_proc:
+  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C salt-master -u root -c 1:10"
+  interval: 60
+  occurrences: 1
+  subscribers:
+  - local-salt-master
+local_salt_minion_proc:
+  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C salt-minion -u root -c 1:10"
+  interval: 60
+  occurrences: 1
+  subscribers:
+  - local-salt-minion
diff --git a/salt/meta/sphinx.yml b/salt/meta/sphinx.yml
new file mode 100644
index 0000000..d10c7a0
--- /dev/null
+++ b/salt/meta/sphinx.yml
@@ -0,0 +1,11 @@
+{%- set server = pillar.sphinx.server %}
+name: Salt
+description: Salt is a new approach to infrastructure management. Easy enough to get running in minutes, scalable enough to manage tens of thousands of servers, and fast enough to communicate with them in seconds.
+role:
+{%- if pillar.salt.minion is defined %}
+  minion:
+    name: minion
+    param:
+      version:
+        value: {{ salt['cmd.run']('salt-minion --version')|replace('salt-minion ', '') }}
+{%- endif %}