Merge pull request #155 from sexibytes/dev

Update to 0.99e

CHANGELOG.md

@@ -2,7 +2,26 @@
 
 ## [Unreleased](https://github.com/sexibytes/sexigraf/tree/HEAD)
 
-[Full Changelog](https://github.com/sexibytes/sexigraf/compare/0.99c...HEAD)
+[Full Changelog](https://github.com/sexibytes/sexigraf/compare/0.99d...HEAD)
+
+**Implemented enhancements:**
+
+- Display appliance version in SexiMenu [\#122](https://github.com/sexibytes/sexigraf/issues/122)
+- Dashboard init failed Template variables could not be initialized: undefined [\#62](https://github.com/sexibytes/sexigraf/issues/62)
+
+**Fixed bugs:**
+
+- House Cleaner not expanding subfolders [\#120](https://github.com/sexibytes/sexigraf/issues/120)
+- Dashboard init failed Template variables could not be initialized: undefined [\#62](https://github.com/sexibytes/sexigraf/issues/62)
+- dashboard metrics definition  [\#26](https://github.com/sexibytes/sexigraf/issues/26)
+
+**Closed issues:**
+
+- lower Y-Max from 180 to 150 on cpu/ram usage graph [\#117](https://github.com/sexibytes/sexigraf/issues/117)
+- Time data request Error on graph [\#37](https://github.com/sexibytes/sexigraf/issues/37)
+
+## [0.99d](https://github.com/sexibytes/sexigraf/tree/0.99d) (2017-07-13)
+[Full Changelog](https://github.com/sexibytes/sexigraf/compare/0.99c...0.99d)
 
 **Implemented enhancements:**
 
@@ -16,6 +35,7 @@
 - Add link to filtered dashboard [\#81](https://github.com/sexibytes/sexigraf/issues/81)
 - add datastore selection in capacity planning dashboards [\#80](https://github.com/sexibytes/sexigraf/issues/80)
 - Add vSphere "ready" metric per vm [\#79](https://github.com/sexibytes/sexigraf/issues/79)
+- Add https connection test before auth test against vCenter [\#73](https://github.com/sexibytes/sexigraf/issues/73)
 - add auto archive/delete whisper files [\#69](https://github.com/sexibytes/sexigraf/issues/69)
 
 **Fixed bugs:**
@@ -29,6 +49,8 @@
 
 **Closed issues:**
 
+- Datacenter names with ÅÄÖ will cause problems [\#114](https://github.com/sexibytes/sexigraf/issues/114)
+- VSAN Disk Utilization dashboard [\#113](https://github.com/sexibytes/sexigraf/issues/113)
 - Document what the different graphs mean [\#108](https://github.com/sexibytes/sexigraf/issues/108)
 - Only 1 host being discovered [\#104](https://github.com/sexibytes/sexigraf/issues/104)
 - doesn't match vsan resyrn value. [\#101](https://github.com/sexibytes/sexigraf/issues/101)
@@ -49,6 +71,7 @@
 
 **Merged pull requests:**
 
+- Update to 0.99d [\#116](https://github.com/sexibytes/sexigraf/pull/116) ([vmdude](https://github.com/vmdude))
 - Import last DEV environment before master merge [\#111](https://github.com/sexibytes/sexigraf/pull/111) ([vmdude](https://github.com/vmdude))
 
 ## [0.99c](https://github.com/sexibytes/sexigraf/tree/0.99c) (2016-05-18)

README.md

@@ -1,5 +1,31 @@
-# SexiGraf
+[![SexiBanner](http://www.sexigraf.fr/wp-content/uploads/2017/07/SexiGrafBanner.png)](http://www.sexigraf.fr)
 
 [![Join the chat at https://gitter.im/sexibytes/sexigraf](https://badges.gitter.im/sexibytes/sexigraf.svg)](https://gitter.im/sexibytes/sexigraf?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-SexiGraf is a vSphere centric Graphite appliance with a Grafana frontend.
+SexiGraf is a fully open-source vSphere centric Graphite VMware appliance with a Grafana frontend. It pulls VI and VSAN metrics from VMware vCenter APIs, push them to Graphite and let Grafana produces the gorgeous dashboards we love so much!
+
+*Official website for this awesome appliance is available at http://www.sexigraf.fr*
+
+## VMware VSAN
+
+The metrics used in the various VSAN dashboards are collected every minutes using to the `QueryVsanStatistics` API method of `HostVsanInternalSystem`. With some json ticks, it is possible to access any metrics from the VSAN cluster. And guess what! We’re already working on other cool SexiPanels for VSAN: http://www.sexigraf.fr/vsan-sexipanels/
+
+## VMware vSphere
+
+Fast. Very fast. That’s what we had in mind when we designed SexiGraf. When you need vSphere metrics, the obvious way is the `PerformanceManager`, but we need something faster so we choosed managed object properties and quickstats like `ResourcePoolQuickStats`. If we have no other choice, we failback to the `PerformanceManager` but we only query the last 15 samples of the `RealTime samplingPeriod` since we pull vSphere metrics every 5 minutes. http://www.sexigraf.fr/vsphere-sexipanels/  
+
+## FreeNAS
+
+Starting from version 9.10, FreeNAS allows users to set a “Remote Graphite Server” target to send all the metrics harvested by Collectd. Guess what would make a nice Graphite target! http://www.sexigraf.fr/freenas-sexipanel/
+
+## Windows
+
+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
+
+Soon. http://www.sexigraf.fr/hp-c7000-sexipanels/
+
+## S.M.A.R.T.
+
+Soon. http://www.sexigraf.fr/s-m-a-r-t-sexipanels/

etc/apache2/sites-available/graphite.conf

@@ -49,3 +49,29 @@
 	ServerSignature Off
 
 </VirtualHost>
+
+<VirtualHost *:443>
+
+        SSLEngine on
+        SSLCertificateFile /etc/apache2/ssl/sexigraf.crt
+        SSLCertificateKeyFile /etc/apache2/ssl/sexigraf.key
+
+        ProxyPass /admin/ !
+        Alias /admin/   /var/www/admin/
+        <Directory /var/www/admin/>
+                Order allow,deny
+                Allow from all
+        </Directory>
+
+        SetEnv force-proxy-request-1.0 1
+        SetEnv proxy-nokeepalive 1
+
+        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>

etc/apache2/ssl/sexigraf.crt

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDxzCCAq+gAwIBAgIJAPX4sXSuGLKmMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
+BAYTAkZSMQ4wDAYDVQQIDAVQQVJJUzEOMAwGA1UEBwwFUEFSSVMxETAPBgNVBAoM
+CFNleGlHcmFmMRcwFQYDVQQDDA5zZXhpZ3JhZi5sb2NhbDEfMB0GCSqGSIb3DQEJ
+ARYQcGxvdEBzZXhpZ3JhZi5mcjAeFw0xODA3MjAxMTQzMjJaFw0yODA3MTcxMTQz
+MjJaMHoxCzAJBgNVBAYTAkZSMQ4wDAYDVQQIDAVQQVJJUzEOMAwGA1UEBwwFUEFS
+SVMxETAPBgNVBAoMCFNleGlHcmFmMRcwFQYDVQQDDA5zZXhpZ3JhZi5sb2NhbDEf
+MB0GCSqGSIb3DQEJARYQcGxvdEBzZXhpZ3JhZi5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAM3gya4TGi7ZxgXybXkqO3TcjejAb9T00O8BuZAeXt+z
+2UXeADdj4QEUvXPLABdi17gfBs6zJd2dZwcRq+YBEqSSaljpcQXiQJvbxMrDIEpH
+HqptpkZHNNBhic/VGBXRe2KKHUQCnGyqMBeiPZUdhwWQGFVGPiFHXiYZChrjAUTn
+vbXyamdhb1CLXwbCUc5PIlp+Gd6gVkPa7qII75AmhrxBsEVN3sqcXLVIRtMxUpw9
+k6OOmAJqg//lBvezACg4HYXJLLGaZSrzFRF1Hp41wnQ6iyih8z9dW6/fHx5LqKw2
+Ud/WMiON+zytjeh/2uoasT7ANaqBkdCNVKPbKv3BlH8CAwEAAaNQME4wHQYDVR0O
+BBYEFMyI81uNrVV4xfcvP9KUi66LALpbMB8GA1UdIwQYMBaAFMyI81uNrVV4xfcv
+P9KUi66LALpbMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFxTQq6G
+uDViuI1AqlO6T4HnveOdYnzbjmHsPxgczEKGC0KjMjqMmbGxUblxbd+cUcifrXTw
+WCaPgidNSUN6vqdyGS8p7veZDlyzSQo4Z4PpU09R+xvWiKnoGi4/VJhM5e4DDxsH
+Fvr9cG7d3hIN1e0rl8gCGZKKJ7bj/h463CsDBQRGTsfe/vizzwGXYdXqqtximVRK
+bU27TyxZUqLO0fickkRnTXN4fjkn/RZydRYSyU5GQox/AQIWtPSEIl5PI1M03d8d
+BgHq2x3X7bgxoE1e1/6gYy03O5JmFCr6maevwGHc1l1E/yJzlESwawxYDhhuZPJV
+p+gPqjh+4EZ0A1o=
+-----END CERTIFICATE-----

etc/apache2/ssl/sexigraf.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDN4MmuExou2cYF
+8m15Kjt03I3owG/U9NDvAbmQHl7fs9lF3gA3Y+EBFL1zywAXYte4HwbOsyXdnWcH
+EavmARKkkmpY6XEF4kCb28TKwyBKRx6qbaZGRzTQYYnP1RgV0Xtiih1EApxsqjAX
+oj2VHYcFkBhVRj4hR14mGQoa4wFE57218mpnYW9Qi18GwlHOTyJafhneoFZD2u6i
+CO+QJoa8QbBFTd7KnFy1SEbTMVKcPZOjjpgCaoP/5Qb3swAoOB2FySyxmmUq8xUR
+dR6eNcJ0OosoofM/XVuv3x8eS6isNlHf1jIjjfs8rY3of9rqGrE+wDWqgZHQjVSj
+2yr9wZR/AgMBAAECggEAGI86P+PTecdM0iTLXmrlUNmGrD9Yl+Tkj7567nBRDQqd
+XrJPAEyP6Nsahpeu2RtXdIVvAHVqjPdb9QHsqbFzEeLNgPHII9WLs4wR+8YvMe0u
+AVK3RSb1a+5WzE41Y1TsDSNAvn45PtVGi2s1QXaWRtmbrYCFpN6ooo7WH8L4wclU
+jqUZm2/JzM6ecGrzgp3wO+S3fAsUAHM0UThlVCPyLPwEjAcGWS1SzJIVVAxUiyl+
+uy7/tkWuDZfjDE8yCMBW+FWHRO+8TxZ42zDYnKcm6jSZDq2u0BDO2c9pcBTmg0rz
+GEbPe9syWkq+K5FtkfumECVO9jioGGmyg1dl+n/IoQKBgQDuOTEEiMo6k+UcSNh7
+s81vprpxgUtHNa/KRFRogycLzPm6PzjWJKsLdDZZLby0QHw0oAXf9Pl3i59oeGVZ
+RKNL6j7IeYKF9/FIVkQw65ta2Xhv4HSyLPGNkcReco1dVdEWAgBWLNnOKz/PraT1
+dXlKlFGifwxUfZN2mztneI3cGQKBgQDdPbMtqV3+KhHBGnh5xuTjK5Rk81nnUYSk
+QP9MjP0tfsNb/XOWwTJ7CkqlV1ZXxuVDWtdHCnLv7KTzj+4GgYfcZC9wYpAzlrj6
+D67OebM9Ua/9cTb2nkEkJqzR2IcAWGCzzcsgcbyu0f+jskGc2Ll/85rPTgyTig9R
+U88zYWMIVwKBgQDXGutJBd9dX3gMvzZDFMsW2z0VCsOXjEGsaWCycmLKhA6m/zlq
+G/gawpfklKkFNgkxV6GWZVTxfjC1m6kgHxs4jE6epSGXqJfFUqgGaGiCc0YN92ZI
+EM8YnxvqkJNXSQsgTTRSm/Mb9++Jrmj6f1XDYwQHr6LJlA6YlXjhaHjn2QKBgFOz
+Ngh+XPr9O35M32ti3dE7+YY/srGa242wsWVqqZX+sTYqKwLL0KdP+3GWGypWKwJS
+acOMpnMymi0zNJ/tfVLZ7ECeaWO7D/w61q1yyWbXcrd1j4+5y3c70oIJYvm0ddFQ
+eBqsLPAOrqJlnAEU1QkdRmJLauKehrED/g24OFk9AoGATueftedrWgaFT1cRW6ks
+Hr+ysm/6LEczJb3W+alq8hRcjYWfC2Ryrs+/nBXECswm+usl+uDnhzfchZAK1nYS
+i5FqRBIClPPxV4YUnw2Yt15mgUXV3ibTiIJcF0g6Vj/pz/dYvT6F655VKjnoHqIo
+/RRDdA0DIh52ZlBjxx2Y7go=
+-----END PRIVATE KEY-----

etc/carbon/storage-schemas.conf

@@ -23,7 +23,7 @@ pattern = ^collectd\.sexigraf\.*
 retentions = 1m:1h,2m:2h,4m:3h,12m:12h,24m:2d,96m:7d,192m:30d,3840m:1y
 
 [vsan]
-pattern = .*\.vsan\.(client|compmgr|owner|lsom|dom).*
+pattern = .*\.vsan\.*
 retentions = 1m:1h,2m:2h,4m:3h,12m:12h,24m:2d,96m:7d,192m:30d,960m:180d
 
 [anything_else]

etc/cron.d/ViOfflineInventory

@@ -1 +1 @@
-3 */6  * * * root /usr/bin/perl /root/getInventory.pl
+3 *  * * * root /usr/bin/perl /root/getInventory.pl

etc/logrotate.d/sexigraf

@@ -1,7 +1,7 @@
 /var/log/sexigraf/*.log {
-  daily
+  hourly
   missingok
-  rotate 14
+  rotate 24
   compress
   delaycompress
   notifempty

etc/sexigraf_version

@@ -1 +1 @@
-0.99d "Nova Prospekt"
+0.99e "White Forest"

root/099e_update.sh

@@ -0,0 +1,31 @@
+if grep -i -q "Nova Prospekt" /etc/sexigraf_version; then
+ /bin/cp -rf /tmp/sexigraf-update/sexigraf-master/etc/* /etc/
+ /bin/cp -rf /tmp/sexigraf-update/sexigraf-master/root/* /root/
+ /bin/cp -rf /tmp/sexigraf-update/sexigraf-master/usr/* /usr/
+ /bin/cp -rf /tmp/sexigraf-update/sexigraf-master/var/* /var/
+ /bin/tar -xzf /root/VMware-vSphere-Perl-SDK-6.7.0-8156551.x86_64.tar.gz -C /root
+ /bin/sed -i 's/ubuntu/debian/g' /root/vmware-vsphere-cli-distrib/vmware-install.pl
+ yes | PAGER=/bin/cat /root/vmware-vsphere-cli-distrib/vmware-install.pl default
+ mv /root/genisoimage /usr/bin/
+ chmod +x /usr/bin/genisoimage
+ chown grafana:grafana /var/lib/grafana/dashboards/*.json
+ mv /etc/cron.daily/logrotate /etc/cron.hourly/
+ service grafana-server restart
+ a2enmod rewrite
+ a2enmod ssl
+ rm -rf /root/vmware-vsphere-cli-distrib
+ rm -f /root/VMware-vSphere-Perl-SDK-6.7.0-8156551.x86_64.tar.gz
+ rm -f /var/lib/graphite/whisper/vmw/*/*/*/quickstats/vRAM.wsp
+ echo "Pimp Your Stats!"
+ apachectl graceful
+ rm -f /root/099e_update.sh
+else
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ echo "     THIS UPDATE IS NOT SUPPORTED ON YOUR SEXIGRAF VERSION     "
+ echo "            PLEASE UPGRADE TO 0.99d AND TRY AGAIN              "
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ rm -f /root/099e_update.sh
+ exit 1
+fi