Merge pull request #232 from sexibytes/dev6

Dev6

.gitignore

@@ -0,0 +1 @@
+.DS_Store

README.md

@@ -22,9 +22,9 @@ Starting from version 9.10, FreeNAS allows users to set a “Remote Graphite Ser
 
 Leveraging the built-in Graphite listener of SexiGraf, we introduced Windows support in version 0.99c with basic cpu-ram-hdd metrics : http://www.sexigraf.fr/windows-sexipanel/
 
-## HP C7000
+## HP C7000 *deprecated*
 
-Soon. http://www.sexigraf.fr/hp-c7000-sexipanels/
+Never. http://www.sexigraf.fr/hp-c7000-sexipanels/
 
 ## S.M.A.R.T.
 

etc/apache2/sites-available/graphite.conf

@@ -1,47 +1,98 @@
+<IfModule !wsgi_module.c>
+ LoadModule wsgi_module modules/mod_wsgi.so
+</IfModule>
+
+WSGISocketPrefix run/wsgi
+ExtendedStatus On
+
 <VirtualHost *:8080>
 
- WSGIDaemonProcess _graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=_graphite group=_graphite
- WSGIProcessGroup _graphite
- WSGIImportScript /usr/share/graphite-web/graphite.wsgi process-group=_graphite application-group=%{GLOBAL}
- WSGIScriptAlias / /usr/share/graphite-web/graphite.wsgi
+ # ServerName graphite
+ DocumentRoot "/opt/graphite/webapp"
+ ErrorLog /var/log/apache2/graphite/error.log
+ CustomLog /var/log/apache2/graphite/access.log common
+
+ # I've found that an equal number of processes & threads tends
+ # to show the best performance for Graphite (ymmv).
+ WSGIDaemonProcess graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120
+ WSGIProcessGroup graphite
+ WSGIApplicationGroup %{GLOBAL}
+ WSGIImportScript /opt/graphite/conf/graphite.wsgi process-group=graphite application-group=%{GLOBAL}
 
- Alias /content/ /usr/share/graphite-web/static/
- <Location "/content/">
- SetHandler None
- </Location>
+ # XXX You will need to create this file! There is a graphite.wsgi.example
+ # file in this directory that you can safely use, just copy it to graphite.wgsi
+ WSGIScriptAlias / /opt/graphite/conf/graphite.wsgi
 
  <Location "/">
  Order deny,allow
  Deny from all
  Allow from 127.0.0.0/255.0.0.0 ::1/128
  </Location>
 
+ <Location "/server-status">
+ SetHandler server-status
+ </Location>
 
- ErrorLog ${APACHE_LOG_DIR}/graphite-web_error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
+ # XXX To serve static files, either:
+ # * Install the whitenoise Python package (pip install whitenoise)
+ # * Collect static files in a directory by running:
+ # django-admin.py collectstatic --noinput --settings=graphite.settings
+ # And set an alias to serve static files with Apache:
+ Alias /static/ /opt/graphite/static/
 
- CustomLog ${APACHE_LOG_DIR}/graphite-web_access.log combined
+ <Directory /opt/graphite/static/>
+ Require all granted
+ </Directory>
 
- ServerSignature Off
+ ########################
+ # URL-prefixed install #
+ ########################
+ # If using URL_PREFIX in local_settings for URL-prefixed install (that is not located at "/"))
+ # your WSGIScriptAlias line should look like the following (e.g. URL_PREFX="/graphite"
+
+ # WSGIScriptAlias /graphite /srv/graphite-web/conf/graphite.wsgi/graphite
+ # Alias /graphite/static /opt/graphite/webapp/content
+ # <Location "/graphite/static/">
+ # SetHandler None
+ # </Location>
+
+
+ # XXX In order for the django admin site media to work you
+ # must change @DJANGO_ROOT@ to be the path to your django
+ # installation, which is probably something like:
+ # /usr/lib/python2.6/site-packages/django
+ Alias /media/ "@DJANGO_ROOT@/contrib/admin/media/"
+
+ # The graphite.wsgi file has to be accessible by apache. It won't
+ # be visible to clients because of the DocumentRoot though.
+ <Directory /opt/graphite/conf/>
+ <IfVersion < 2.4>
+ Order deny,allow
+ Allow from all
+ </IfVersion>
+ <IfVersion >= 2.4>
+ Require all granted
+ </IfVersion>
+ </Directory>
 
 </VirtualHost>
 
 <VirtualHost *:80>
 
- ProxyPass /admin/ !
- Alias /admin/ /var/www/admin/
+ ProxyPass /sexiadmin/ !
+ Alias /sexiadmin/ /var/www/admin/
  <Directory /var/www/admin/>
  Order allow,deny
  Allow from all
  </Directory>
 
+ ProxyPass /favicon.ico !
+ Alias /favicon.ico /var/www/admin/images/favicon.ico
+
  SetEnv force-proxy-request-1.0 1
  SetEnv proxy-nokeepalive 1
+ ProxyPass /netdata/ http://127.0.0.1:19999/
  ProxyPass / http://127.0.0.1:3000/
- ProxyPassReverse / http://127.0.0.1:3000/
 
  ErrorLog /var/log/apache2/error.log
  LogLevel warn
@@ -56,22 +107,25 @@
  SSLCertificateFile /etc/apache2/ssl/sexigraf.crt
  SSLCertificateKeyFile /etc/apache2/ssl/sexigraf.key
 
- ProxyPass /admin/ !
- Alias /admin/ /var/www/admin/
+ ProxyPass /sexiadmin/ !
+ Alias /sexiadmin/ /var/www/admin/
  <Directory /var/www/admin/>
  Order allow,deny
  Allow from all
  </Directory>
 
+ ProxyPass /favicon.ico !
+ Alias /favicon.ico /var/www/admin/images/favicon.ico
+
  SetEnv force-proxy-request-1.0 1
  SetEnv proxy-nokeepalive 1
 
+ ProxyPass /netdata/ http://127.0.0.1:19999/
  ProxyPass / http://127.0.0.1:3000/
- ProxyPassReverse / http://127.0.0.1:3000/
 
  ErrorLog /var/log/apache2/error.log
  LogLevel warn
  CustomLog /var/log/apache2/access.log combined
  ServerSignature Off
 
-</VirtualHost>
+</VirtualHost>