]> arthur.barton.de Git - netdata.git/commitdiff
Merge branch 'master' into ab-debian
authorAlexander Barton <alex@barton.de>
Mon, 27 Mar 2017 11:36:17 +0000 (13:36 +0200)
committerAlexander Barton <alex@barton.de>
Mon, 27 Mar 2017 11:36:17 +0000 (13:36 +0200)
* master:
  smartd_log plugin: convert chart family to lower case
  ovpn_status_log plugin: minor fixes
  fail2bain plugin: "Currently In Jail" chart renamed
  dns_query_time plugin: replace "." with "_" in dimensions
  updated configs.signatures
  ZFS plugin for Linux; fixes #1994
  dns_query_time plugin: python readme update
  dns_query_time plugin: makefiles and python.d.conf update
  dns_query_time plugin: module configuration file added
  dns_query_time plugin: added
  added backends debugging; #2017
  fail2ban_plugin: "filterfalse" removed
  fail2ban_plugin: "Currently In Jail" chart added
  prevent a crash if loadvg chart is disabled
  Minimize reallocz usage in FreeBSD plugin
  Fix compilation error on FreeBSD 10.3
  postgres_plugin: module configuration file update
  postgres_plugin: option to exclude databases from poll added

1  2 
web/index.html

diff --combined web/index.html
index b62306a2655ae56069a26e1bb909d0a1b94ee4e1,e845be1a56ac0aa10f57434d910ee0bb12fcd412..3283b16e89cf53e215ca0a6758a30758ff6a783b
              })
              .done(function(data) {
                  data = data.replace(/(\r\n|\n|\r| |\t)/gm,"");
 -
 -                var c = getNetdataCommitIdFromVersion();
 -                if(c !== null && data.length === 40 && data.substring(0, 7) !== c) {
 -                    versionLog('Installed files commit id and internal netdata git commit id do not match');
 -                    data = c;
 +                if(data.length !== 40) {
 +                    var c = getNetdataCommitIdFromVersion();
 +                    if(c === null) versionLog('Cannot find the git commit id of netdata.');
 +                    callback(c);
                  }
 -
 -                if(data.length >= 7) {
 +                else {
                      versionLog('Installed git commit id of netdata is ' + data);
                      document.getElementById('netdataCommitId').innerHTML = data.substring(0, 7);
                      callback(data);
              });
  
              NETDATA.requiredJs.push({
-                 url: NETDATA.serverDefault + 'dashboard_info.js?v20170308-1',
+                 url: NETDATA.serverDefault + 'dashboard_info.js?v20170325-1',
                  async: false,
                  isAlreadyLoaded: function() { return false; }
              });
      </div>
  </body>
  </html>
- <script type="text/javascript" src="dashboard.js?v20170211-2"></script>
+ <script type="text/javascript" src="dashboard.js?v20170325-1"></script>