graphite

salt/graphite/configuration.sls

@@ -17,7 +17,7 @@ requirements:
       - require:
       - require:
         - user: {{ pillar['graphite']['user'] }}
         - user: {{ pillar['graphite']['user'] }}
   
   
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
 
 
 /etc/systemd/system/graphite.service:
 /etc/systemd/system/graphite.service:
   file.managed:
   file.managed:

salt/graphite/files/requirements.txt

@@ -9,6 +9,6 @@ pytz
 pyparsing
 pyparsing
 whisper
 whisper
 {% if grains['os_family'] != 'RedHat' %} 
 {% if grains['os_family'] != 'RedHat' %} 
-carbon==0.9.12
+carbon==0.9.12 --install-option="--prefix=/opt/graphite" --install-option="--install-lib=/opt/graphite/lib"
 {% endif %}
 {% endif %}
-graphite-web
+graphite-web --install-option="--prefix=/opt/graphite" --install-option="--install-lib=/opt/graphite/webapp"

salt/graphite/rabbitmq.sls

@@ -11,11 +11,14 @@ rabbitmq_user_monitor:
   rabbitmq_user.present:
   rabbitmq_user.present:
     - name: {{ pillar['graphite']['user'] }}
     - name: {{ pillar['graphite']['user'] }}
     - password: {{ pillar['graphite']['password'] }}
     - password: {{ pillar['graphite']['password'] }}
+    - require:
+      - rabbitmq_vhost: virtual_host_monitor
+    - perms:
+      - {{ pillar['graphite']['vhost']}}:
+        - .*
+        - .*
+        - .*
 
 
 virtual_host_monitor:
 virtual_host_monitor:
     rabbitmq_vhost.present:
     rabbitmq_vhost.present:
         - name: {{ pillar['graphite']['vhost']}}
         - name: {{ pillar['graphite']['vhost']}}
-        - user: {{ pillar['graphite']['user'] }}
-        - conf: .*
-        - write: .*
-        - read: .*