Różnice pomiędzy wersjami 17 i 19 (Spinanie 2 wersji)
⇤ ← Wersja 17 z 2015-07-12 21:16:37 →
Rozmiar: 22536
Edytor: wtps0n
Komentarz: * aktualizacja łatek, dodanie graphdefs
← Wersja 19 z 2016-03-01 09:34:14 → ⇥
Rozmiar: 17245
Edytor: wtps0n
Komentarz: * przebudowa - podstrony
Usunięcia zostały oznaczone w ten sposób. Dodatki zostały oznaczone w ten sposób.
Linia 4: Linia 4:
<<TableOfContents()>><<BR>> <<Action(print,Wydrukuj tę dokumentację>><<BR>>
<<TableOfContents()>><<BR>><<Navigation(children)>><<BR>>
Linia 403: Linia 404:
== Pathowanie collectd.modified.cgi ==
Poniższy patch jest dla wersji '''0.4.1''':

{{{#!diff numbers=off
--- data/cgi-bin/collection.modified.cgi.orig 2012-12-31 01:51:09.000000000 +0100
+++ data/cgi-bin/collection.modified.cgi 2015-07-11 13:39:06.612409999 +0200
@@ -27,7 +27,7 @@
 use RRDs ();
 use Data::Dumper ();
 use JSON ('to_json');
-our $Config = "/etc/collectd/collection.conf";
+our $Config = "/usr/local/etc/collectd-web.conf";
 our @DataDirs = ();
 our $LibDir;
 our $make_transparent = 1;
@@ -39,6 +39,9 @@
     year => 366 * 86400
 };

+# --- wy/l/aczenie logowania b/l/ed/ow w logacha serwera www. U/zywa/c z rozs/adkiem - s/lu/zy do poprawek
+#
+##$CGI::LIST_CONTEXT_WARN = 0;

 our @RRDDefaultArgs = (
 '--rigid', '-w', '500', '-h', '160', '--alt-autoscale-max', '--alt-y-grid',
@@ -191,7 +194,9 @@
 sub _get_param_host {
     my %all_hosts = map { $_ => 1 } ( _find_hosts() );
     my @selected_hosts = ();
- for ( param('host') ) {
+ my @loc_hosts = ();
+ push @loc_hosts, scalar param('host');
+ for ( @loc_hosts ) {
         if ( defined( $all_hosts{$_} ) ) {
             push( @selected_hosts, "$_" );
         }
@@ -619,7 +624,7 @@
         $plugins_per_host->{ $hosts[$i] } = _find_files_for_host( $hosts[$i] );
         _files_union( $all_plugins, $plugins_per_host->{ $hosts[$i] } );
     }
- for ( param('plugin') ) {
+ for ( scalar param('plugin') ) {
         if ( defined( $all_plugins->{$_} ) ) {
             $selected_plugins->{$_} = 1;
         }
@@ -1059,6 +1064,35 @@
             'GPRINT:max:MAX:%6.2lf Max,',
             'GPRINT:avg:LAST:%6.2lf Last'
         ],
+ io_octets => [
+ 'DEF:out_min={file}:tx:MIN',
+ 'DEF:out_avg={file}:tx:AVERAGE',
+ 'DEF:out_max={file}:tx:MAX',
+ 'DEF:inc_min={file}:rx:MIN',
+ 'DEF:inc_avg={file}:rx:AVERAGE',
+ 'DEF:inc_max={file}:rx:MAX',
+ 'CDEF:overlap=out_avg,inc_avg,GT,inc_avg,out_avg,IF',
+ 'CDEF:mytime=out_avg,TIME,TIME,IF',
+ 'CDEF:sample_len_raw=mytime,PREV(mytime),-',
+ 'CDEF:sample_len=sample_len_raw,UN,0,sample_len_raw,IF',
+ 'CDEF:out_avg_sample=out_avg,UN,0,out_avg,IF,sample_len,*',
+ 'CDEF:out_avg_sum=PREV,UN,0,PREV,IF,out_avg_sample,+',
+ 'CDEF:inc_avg_sample=inc_avg,UN,0,inc_avg,IF,sample_len,*',
+ 'CDEF:inc_avg_sum=PREV,UN,0,PREV,IF,inc_avg_sample,+',
+ "AREA:out_avg#$HalfGreen",
+ "AREA:inc_avg#$HalfBlue",
+ "AREA:overlap#$HalfBlueGreen",
+ "LINE1:out_avg#$FullGreen:Written",
+ 'GPRINT:out_avg:AVERAGE:%5.1lf%s Avg,',
+ 'GPRINT:out_max:MAX:%5.1lf%s Max,',
+ 'GPRINT:out_avg:LAST:%5.1lf%s Last',
+ 'GPRINT:out_avg_sum:LAST:(ca. %5.1lf%sB Total)\l',
+ "LINE1:inc_avg#$FullBlue:Read ",
+ 'GPRINT:inc_avg:AVERAGE:%5.1lf%s Avg,',
+ 'GPRINT:inc_max:MAX:%5.1lf%s Max,',
+ 'GPRINT:inc_avg:LAST:%5.1lf%s Last',
+ 'GPRINT:inc_avg_sum:LAST:(ca. %5.1lf%sB Total)\l'
+ ],
         cache_result => [
             'DEF:min={file}:value:MIN',
             'DEF:avg={file}:value:AVERAGE',
@@ -1071,6 +1105,18 @@
             'GPRINT:max:MAX:%6.2lf Max,',
             'GPRINT:avg:LAST:%6.2lf Last'
         ],
+ cache_size => [
+ 'DEF:min={file}:value:MIN',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:max={file}:value:MAX',
+ "AREA:max#$HalfBlue",
+ "AREA:min#$Canvas",
+ "LINE1:avg#$FullBlue:ARC cache size (Bytes)",
+ 'GPRINT:min:MIN:%6.2lf%s Min,',
+ 'GPRINT:avg:AVERAGE:%6.2lf%s Avg,',
+ 'GPRINT:max:MAX:%6.2lf%s Max,',
+ 'GPRINT:avg:LAST:%6.2lf%s Last'
+ ],
         apache_scoreboard => [
             'DEF:min={file}:value:MIN',
             'DEF:avg={file}:value:AVERAGE',
@@ -3215,9 +3261,23 @@
             'GPRINT:avg:LAST:%6.2lf Last'
         ],
 # jaf-18aug11 END
-
-
+ bytes => ['-v', 'Bytes',
+ 'DEF:avg={file}:value:AVERAGE',
+ 'DEF:min={file}:value:MIN',
+ 'DEF:max={file}:value:MAX',
+ "AREA:max#$HalfGreen",
+ "AREA:min#$Canvas",
+ "LINE1:avg#$FullGreen:Bytes",
+ 'GPRINT:min:MIN:%4.1lf Min,',
+ 'GPRINT:avg:AVERAGE:%4.1lf Avg,',
+ 'GPRINT:max:MAX:%4.1lf Max,',
+ 'GPRINT:avg:LAST:%4.1lf Last\l'
+ ],
     };
+ $GraphDefs->{'ps_code'} = $GraphDefs->{'ps_state'};
+ $GraphDefs->{'ps_data'} = $GraphDefs->{'ps_state'};
+ $GraphDefs->{'ps_stacksize'} = $GraphDefs->{'ps_state'};
+ $GraphDefs->{'ps_vm'} = $GraphDefs->{'ps_state'};
     $GraphDefs->{'if_multicast'} = $GraphDefs->{'ipt_packets'};
     $GraphDefs->{'if_tx_errors'} = $GraphDefs->{'if_rx_errors'};
     $GraphDefs->{'dns_qtype'} = $GraphDefs->{'dns_opcode'};
@@ -3234,6 +3294,14 @@
 # jaf-18aug11 END
     $GraphDefs->{'vmpage_io-memory'} = $GraphDefs->{'vmpage_io'};
     $GraphDefs->{'vmpage_io-swap'} = $GraphDefs->{'vmpage_io'};
+ $GraphDefs->{'cache_ratio'} = $GraphDefs->{'cache_result'};
+ $GraphDefs->{'cache_eviction'} = $GraphDefs->{'cache_result'};
+ $GraphDefs->{'cache_operation'} = $GraphDefs->{'cache_result'};
+ $GraphDefs->{'mutex_operations'} = $GraphDefs->{'cache_result'};
+ $GraphDefs->{'hash_collisions'} = $GraphDefs->{'cache_result'};
+ $GraphDefs->{'operations'} = $GraphDefs->{'derive'};
+ $GraphDefs->{'queue_length'} = $GraphDefs->{'gauge'};
+ $GraphDefs->{'total_values'} = $GraphDefs->{'gauge'};
     $MetaGraphDefs->{'cpu'} = \&meta_graph_cpu;
     $MetaGraphDefs->{'df_complex'} = \&meta_graph_df_complex;
     $MetaGraphDefs->{'dns_qtype'} = \&meta_graph_dns;
@@ -3468,7 +3536,7 @@

   @$type_instances = sort @$type_instances;

- $opts->{'colors'} = _get_n_colors ($type_instances);
+ ###$opts->{'colors'} = _get_n_colors ($type_instances);

   for (@$type_instances)
   {
}}}

=== Patchowanie pliku JS ===		 == Łatki, łatki do skryptów CGI ==
Poniżej lista poprawek, które trzeba nałożyć na oryginalne pliki w celu poprawnego działania. Chodzi głównie o ścieżki (zmiany w PERLu) jak również rozwój samego [[http://www.collectd.org/|Collect Demona|target="_blank"]].


=== Łatanie pliku JS ===
Linia 584: Linia 437:
--- data/cgi-bin/graphdefs.cgi 2012-12-31 01:51:09.000000000 +0100
+++ data/cgi-bin/graphdefs.cgi.new 2015-07-11 13:39:58.777406000 +0200		 --- graphdefs.cgi.orig 2012-12-31 01:51:09.000000000 +0100
+++ graphdefs.cgi 2016-02-10 14:36:42.236505826 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/local/bin/perl

 # Collectd-web - graphdefs.cgi
 # Copyright (C) 2009-2010 Kenneth Belitzky
Linia 595: Linia 454:
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@ load_graph_definitions();
Linia 604: Linia 463:
}}}

=== Łatanie pliku time.cgi ===
{{{#!diff numbers=off
--- time.cgi.orig 2012-12-31 01:51:09.000000000 +0100
+++ time.cgi 2016-02-10 14:36:42.236505826 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/local/bin/perl

 # Collectd-web - time.cgi
 # Copyright (C) 2009-2010 Kenneth Belitzky
Linia 621: Linia 492:
{i}` `<<GetVal(SlownikNewBsd,adm-podpis)>> {i} ` `<<GetVal(SlownikNewBsd,adm-podpis)>>

<<Action(print,Wydrukuj tę dokumentację>>

Spis Treści

  1. Konfiguracja collectd
    1. Wersja 4
      1. collectd.conf
      2. uruchomienie rrdcached
    2. Dodanie użytkownika oraz grupy na potrzeby skryptów - plugin exec
    3. Sprawdzenie konfiguracji collectd
    4. Wersja 5
      1. Extra patch dla FreeBSD 10.1+
      2. collectd.conf
      3. apache.conf
      4. collection.cgi
  2. collectweb
    1. Źródła do pobrania
    2. Przygotowania w systemie
    3. Łatki, łatki do skryptów CGI
      1. Łatanie pliku JS
      2. Łatanie pliku graphdefs.cgi
      3. Łatanie pliku time.cgi
    4. Dodanie konfiguracji dla skryptów webowych do collectd
    5. Konfiguracja apache


/CollectionCgi   /CollectionModifiedCgi   /PluginLoad   /PluginMysql   /PluginOpenldap   /PluginPgsql   /PluginRedis  

Konfiguracja collectd

Wersja 4

collectd.conf

W samym collectd.conf trzeba ustawić następujące rzeczy: 

<Plugin syslog>
        LogLevel warning
</Plugin>

<Plugin df>
        FSType "ufs"
        FSType "zfs"
        IgnoreSelected false
        ReportByDevice false
        ReportReserved false
        ReportInodes false
</Plugin>

# dyski ADA, a nie domyślnie ([as]d[0-9])
<Plugin disk>
        Disk "/^ada[0-9]?$/"
        IgnoreSelected false
</Plugin>

<Plugin ping>
        Host __ADRES_IP_DO_SPRAWDZANIA__
</Plugin>

# musi by/c przynajmniej komentarz - nie może być "pusto"
<Plugin processes>
#       Process "name"
</Plugin>

<Plugin tcpconns>
        ListeningPorts false
        LocalPort "22"
        LocalPort "80"
        LocalPort "443"
        LocalPort "25"
        LocalPort "110"
        LocalPort "143"
        LocalPort "993"
        LocalPort "995"
        RemotePort "25"
        RemotePort "80"
        RemotePort "443"
</Plugin>

uruchomienie rrdcached

Ustawienie zmiennych w rc.conf 

rrdcached_enable="YES"
rrdcached_flags="-s www -l unix:/var/run/rrdcached.sock -p /var/run/rrdcached.pid -j /var/db/rrdcached/journal -w 60"

A potem wystartowanie samego demona 

mkdir -p /var/db/rrdcached/journal
rcstart rrdcached

Dodanie użytkownika oraz grupy na potrzeby skryptów - plugin exec

pw add group collectd
pw add user collectd -g collectd -d /var/www/htdocs/virtuals/collectd -s /sbin/nologin

# albo 
pw add user collectd -g collectd -d /usr/local/www/collectd-web -s /sbin/nologin

Sprawdzenie konfiguracji collectd

collectd -t

Wersja 5

Różnice w stosunku do wersji 4. Przede wszystkim korzystamy z "natywnego" panelu CGI zamiast "obcego". Jeśli chodzi o plik konfiguracyjny, to zmiany analogiczne do wersji 4.

Extra patch dla FreeBSD 10.1+

Zapisany jako /usr/ports/net-mgmt/collectd5/files/patch-src__utils_dns.c: 

--- src/utils_dns.c.orig        2015-02-26 11:43:48.496180000 +0100
+++ src/utils_dns.c     2015-05-17 21:32:23.000000000 +0200
@@ -772,6 +772,11 @@
 # if __NAMESER >= 19991006
            case ns_t_tsig:     return ("TSIG");
 # endif
+# if __NAMESER >= 20090302
+           case ns_t_sshfp:    return ("SSHFP");
+           case ns_t_dnskey:   return ("DNSKEY");
+           case ns_t_spf:      return ("SPF");
+# endif
            case ns_t_ixfr:     return ("IXFR");
            case ns_t_axfr:     return ("AXFR");
            case ns_t_mailb:    return ("MAILB");

collectd.conf

Jest nieco różnic w konfiguracji głównie pluginów. Jak również dodane są definicje filtrów jak również "threshold"-ów na końcu pliku konfiguracyjnego. 

<Plugin dns>
        Interface "bge0"
        #IgnoreSource "192.168.0.1"
        SelectNumericQueryTypes false
</Plugin>

apache.conf

Konfiguracja dla Apache składa się z dwóch elementów: definicji katalogu1 oraz ScriptAlias dla wybranej wirtualki: 

# --- definicja katalog/ow ze stronkami -----------------------------
#
<Directory /usr/local/www/collectd>
    Options ExecCGI
    Order allow,deny
    Allow from all
</Directory>

ScriptAlias /stats/ "/usr/local/www/collectd/collection.cgi"

collection.cgi

Oryginalny skrypt jest nieco zmodyfikowanym skryptem z poprzedniej wersji (v4) collectd. Tak więc wymaga dużej liczby poprawek: 

--- /usr/local/www/collectd/collection.cgi      2014-07-24 15:50:23.459797000 +0200
+++ /usr/local/www/collectd/collection.cgi.new  2014-07-24 18:16:55.532191754 +0200
@@ -957,9 +957,9 @@

   $GraphDefs =
   {
-    apache_bytes => ['DEF:min_raw={file}:count:MIN',
-    'DEF:avg_raw={file}:count:AVERAGE',
-    'DEF:max_raw={file}:count:MAX',
+    apache_bytes => ['DEF:min_raw={file}:value:MIN',
+    'DEF:avg_raw={file}:value:AVERAGE',
+    'DEF:max_raw={file}:value:MAX',
     'CDEF:min=min_raw,8,*',
     'CDEF:avg=avg_raw,8,*',
     'CDEF:max=max_raw,8,*',
@@ -976,9 +976,9 @@
     'GPRINT:avg:LAST:%5.1lf%s Last',
     'GPRINT:avg_sum:LAST:(ca. %5.1lf%sB Total)\l'
     ],
-   apache_connections => ['DEF:min={file}:count:MIN',
-    'DEF:avg={file}:count:AVERAGE',
-    'DEF:max={file}:count:MAX',
+   apache_connections => ['DEF:min={file}:value:MIN',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:max={file}:value:MAX',
     "AREA:max#$HalfBlue",
     "AREA:min#$Canvas",
     "LINE1:avg#$FullBlue:Connections",
@@ -987,9 +987,9 @@
     'GPRINT:max:MAX:%6.2lf Max,',
     'GPRINT:avg:LAST:%6.2lf Last'
     ],
-    apache_idle_workers => ['DEF:min={file}:count:MIN',
-    'DEF:avg={file}:count:AVERAGE',
-    'DEF:max={file}:count:MAX',
+    apache_idle_workers => ['DEF:min={file}:value:MIN',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:max={file}:value:MAX',
     "AREA:max#$HalfBlue",
     "AREA:min#$Canvas",
     "LINE1:avg#$FullBlue:Idle Workers",
@@ -998,9 +998,9 @@
     'GPRINT:max:MAX:%6.2lf Max,',
     'GPRINT:avg:LAST:%6.2lf Last'
     ],
-    apache_requests => ['DEF:min={file}:count:MIN',
-    'DEF:avg={file}:count:AVERAGE',
-    'DEF:max={file}:count:MAX',
+    apache_requests => ['DEF:min={file}:value:MIN',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:max={file}:value:MAX',
     "AREA:max#$HalfBlue",
     "AREA:min#$Canvas",
     "LINE1:avg#$FullBlue:Requests/s",
@@ -1009,9 +1009,9 @@
     'GPRINT:max:MAX:%6.2lf Max,',
     'GPRINT:avg:LAST:%6.2lf Last'
     ],
-    apache_scoreboard => ['DEF:min={file}:count:MIN',
-    'DEF:avg={file}:count:AVERAGE',
-    'DEF:max={file}:count:MAX',
+    apache_scoreboard => ['DEF:min={file}:value:MIN',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:max={file}:value:MAX',
     "AREA:max#$HalfBlue",
     "AREA:min#$Canvas",
     "LINE1:avg#$FullBlue:Processes",
@@ -1081,12 +1081,12 @@
     'GPRINT:avg:LAST:%5.1lf%sA Last\l'
     ],
     df => ['-v', 'Percent', '-l', '0',
-    'DEF:free_avg={file}:free:AVERAGE',
-    'DEF:free_min={file}:free:MIN',
-    'DEF:free_max={file}:free:MAX',
-    'DEF:used_avg={file}:used:AVERAGE',
-    'DEF:used_min={file}:used:MIN',
-    'DEF:used_max={file}:used:MAX',
+    'DEF:free_avg={file}:value:AVERAGE',
+    'DEF:free_min={file}:value:MIN',
+    'DEF:free_max={file}:value:MAX',
+    'DEF:used_avg={file}:value:AVERAGE',
+    'DEF:used_min={file}:value:MIN',
+    'DEF:used_max={file}:value:MAX',
     'CDEF:total=free_avg,used_avg,+',
     'CDEF:free_pct=100,free_avg,*,total,/',
     'CDEF:used_pct=100,used_avg,*,total,/',
@@ -2525,9 +2525,9 @@
     'GPRINT:multimeter_avg:LAST:%4.1lf Last\l'
     ],
     users => ['-v', 'Users',
-    'DEF:users_avg={file}:users:AVERAGE',
-    'DEF:users_min={file}:users:MIN',
-    'DEF:users_max={file}:users:MAX',
+    'DEF:users_avg={file}:value:AVERAGE',
+    'DEF:users_min={file}:value:MIN',
+    'DEF:users_max={file}:value:MAX',
     "AREA:users_max#$HalfBlue",
     "AREA:users_min#$Canvas",
     "LINE1:users_avg#$FullBlue:Users",
@@ -2666,7 +2666,117 @@
     'GPRINT:max:MAX:%4.1lf Max,',
     'GPRINT:avg:LAST:%4.1lf Last\l'
     ],
+    cache_size => [
+    'DEF:min={file}:value:MIN',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:max={file}:value:MAX',
+    "AREA:max#$HalfBlue",
+    "AREA:min#$Canvas",
+    "LINE1:avg#$FullBlue:ARC cache size (Bytes)",
+    'GPRINT:min:MIN:%6.2lf%s Min,',
+    'GPRINT:avg:AVERAGE:%6.2lf%s Avg,',
+    'GPRINT:max:MAX:%6.2lf%s Max,',
+    'GPRINT:avg:LAST:%6.2lf%s Last'
+    ],
+    cache_result => [
+    'DEF:min={file}:value:MIN',   'DEF:avg={file}:value:AVERAGE',
+    'DEF:max={file}:value:MAX',   "AREA:max#$HalfBlue",
+    "AREA:min#$Canvas",           "LINE1:avg#$FullBlue:Requests/s",
+    'GPRINT:min:MIN:%6.2lf Min,', 'GPRINT:avg:AVERAGE:%6.2lf Avg,',
+    'GPRINT:max:MAX:%6.2lf Max,', 'GPRINT:avg:LAST:%6.2lf Last'
+    ],
+    io_octets => [
+    'DEF:out_min={file}:tx:MIN',
+    'DEF:out_avg={file}:tx:AVERAGE',
+    'DEF:out_max={file}:tx:MAX',
+    'DEF:inc_min={file}:rx:MIN',
+    'DEF:inc_avg={file}:rx:AVERAGE',
+    'DEF:inc_max={file}:rx:MAX',
+    'CDEF:overlap=out_avg,inc_avg,GT,inc_avg,out_avg,IF',
+    'CDEF:mytime=out_avg,TIME,TIME,IF',
+    'CDEF:sample_len_raw=mytime,PREV(mytime),-',
+    'CDEF:sample_len=sample_len_raw,UN,0,sample_len_raw,IF',
+    'CDEF:out_avg_sample=out_avg,UN,0,out_avg,IF,sample_len,*',
+    'CDEF:out_avg_sum=PREV,UN,0,PREV,IF,out_avg_sample,+',
+    'CDEF:inc_avg_sample=inc_avg,UN,0,inc_avg,IF,sample_len,*',
+    'CDEF:inc_avg_sum=PREV,UN,0,PREV,IF,inc_avg_sample,+',
+    "AREA:out_avg#$HalfGreen",
+    "AREA:inc_avg#$HalfBlue",
+    "AREA:overlap#$HalfBlueGreen",
+    "LINE1:out_avg#$FullGreen:Written",
+    'GPRINT:out_avg:AVERAGE:%5.1lf%s Avg,',
+    'GPRINT:out_max:MAX:%5.1lf%s Max,',
+    'GPRINT:out_avg:LAST:%5.1lf%s Last',
+    'GPRINT:out_avg_sum:LAST:(ca. %5.1lf%sB Total)\l',
+    "LINE1:inc_avg#$FullBlue:Read   ",
+    'GPRINT:inc_avg:AVERAGE:%5.1lf%s Avg,',
+    'GPRINT:inc_max:MAX:%5.1lf%s Max,',
+    'GPRINT:inc_avg:LAST:%5.1lf%s Last',
+    'GPRINT:inc_avg_sum:LAST:(ca. %5.1lf%sB Total)\l'
+    ],
+    counter => [
+    '-v',
+    'Count',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:min={file}:value:MIN',
+    'DEF:max={file}:value:MAX',
+    "AREA:max#$HalfRed",
+    "AREA:min#$Canvas",
+    "LINE1:max#$FullRed:Count ",
+    'GPRINT:min:MIN:%4.1lf Min,',
+    'GPRINT:avg:AVERAGE:%4.1lf Avg,',
+    'GPRINT:max:MAX:%4.1lf Max,',
+    'GPRINT:avg:LAST:%4.1lf Last\l'
+    ],
+    derive => [
+    '-v',
+    'Derive',
+    'DEF:min={file}:value:MIN',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:max={file}:value:MAX',
+    'CDEF:mytime=avg,TIME,TIME,IF',
+    'CDEF:sample_len_raw=mytime,PREV(mytime),-',
+    'CDEF:sample_len=sample_len_raw,UN,0,sample_len_raw,IF',
+    'CDEF:avg_sample=avg,UN,0,avg,IF,sample_len,*',
+    'CDEF:avg_sum=PREV,UN,0,PREV,IF,avg_sample,+',
+    "AREA:max#$HalfRed",
+    "AREA:min#$Canvas",
+    "LINE1:avg#$FullRed:Derive ",
+    'GPRINT:avg:AVERAGE:%5.1lf%s Avg,',
+    'GPRINT:max:MAX:%5.1lf%s Max,',
+    'GPRINT:avg:LAST:%5.1lf%s Last',
+    'GPRINT:avg_sum:LAST:(ca. %5.1lf%s Total)\l'
+    ],
+    uptime => [
+    '-v',
+    'Days',
+    'DEF:raw={file}:value:MAX',
+    'CDEF:out_val=raw,86400,/',
+    'CDEF:out_days=out_val,FLOOR',
+    'CDEF:out_hours=out_val,out_days,-,24,*,FLOOR',
+    'CDEF:out_mins=out_val,out_days,-,24,*,out_hours,-,60,*,FLOOR',
+    'CDEF:out_secs=out_val,out_days,-,24,*,out_hours,-,60,*,out_mins,-,60,*',
+    "AREA:out_val#$HalfBlue",
+    "LINE1:out_val#$FullBlue:Uptime",
+    'GPRINT:out_days:LAST:%6.0lf day(s),',
+    'GPRINT:out_hours:LAST:%6.0lf hour(s),',
+    'GPRINT:out_mins:LAST:%6.0lf min(s),',
+    'GPRINT:out_secs:LAST:%6.0lf sec(s)\l'
+    ],
+    bytes => ['-v', 'Bytes',
+    'DEF:avg={file}:value:AVERAGE',
+    'DEF:min={file}:value:MIN',
+    'DEF:max={file}:value:MAX',
+    "AREA:max#$HalfGreen",
+    "AREA:min#$Canvas",
+    "LINE1:avg#$FullGreen:Bytes",
+    'GPRINT:min:MIN:%4.1lf Min,',
+    'GPRINT:avg:AVERAGE:%4.1lf Avg,',
+    'GPRINT:max:MAX:%4.1lf Max,',
+    'GPRINT:avg:LAST:%4.1lf Last\l'
+    ],
   };
+
   $GraphDefs->{'if_multicast'} = $GraphDefs->{'ipt_packets'};
   $GraphDefs->{'if_tx_errors'} = $GraphDefs->{'if_rx_errors'};
   $GraphDefs->{'dns_qtype'} = $GraphDefs->{'dns_opcode'};
@@ -2674,6 +2784,13 @@
   $GraphDefs->{'vmpage_io-memory'} = $GraphDefs->{'vmpage_io'};
   $GraphDefs->{'vmpage_io-swap'} = $GraphDefs->{'vmpage_io'};
   $GraphDefs->{'virt_cpu_total'} = $GraphDefs->{'virt_cpu_total'};
+  $GraphDefs->{'cache_ratio'} = $GraphDefs->{'cache_result'};
+  $GraphDefs->{'cache_eviction'} = $GraphDefs->{'cache_result'};
+  $GraphDefs->{'cache_operation'} = $GraphDefs->{'cache_result'};
+  $GraphDefs->{'mutex_operations'} = $GraphDefs->{'cache_result'};
+  $GraphDefs->{'hash_collisions'} = $GraphDefs->{'cache_result'};
+  $GraphDefs->{'operations'} = $GraphDefs->{'derive'};
+  $GraphDefs->{'queue_length'} = $GraphDefs->{'gauge'};

   $MetaGraphDefs->{'cpu'} = \&meta_graph_cpu;
   $MetaGraphDefs->{'dns_qtype'} = \&meta_graph_dns;
@@ -2684,6 +2801,7 @@
   $MetaGraphDefs->{'nfs_procedure'} = \&meta_graph_nfs_procedure;
   $MetaGraphDefs->{'ps_state'} = \&meta_graph_ps_state;
   $MetaGraphDefs->{'swap'} = \&meta_graph_swap;
+  $MetaGraphDefs->{'df_complex'} = \&meta_graph_swap;
   $MetaGraphDefs->{'mysql_commands'} = \&meta_graph_mysql_commands;
   $MetaGraphDefs->{'mysql_handler'} = \&meta_graph_mysql_commands;
   $MetaGraphDefs->{'tcp_connections'} = \&meta_graph_tcp_connections;

collectweb

Źródła do pobrania

Strona domowa projektu, to: 

wget --no-check-certificate https://github.com/httpdss/collectd-web/archive/0.4.1.tar.gz

Przygotowania w systemie

Jeżeli chcemy skorzystać z gotowego panelu webowego do collectd w wersji 4, to musimy trochę pododawać w systemie: 

portupgrade -N converters/p5-JSON p5-HTML-Parser p5-URI www/p5-CGI

Albo jeżeli korzystamy z własnego repozytorium pakietów, to wtedy: 

pkg install converters/p5-JSON p5-HTML-Parser p5-URI www/p5-CGI

Dodatkowo partycja, gdzie są skrypty CGI-BIN nie może mieć wyłączonej opcji exec (np. zfs). Inaczej w logach będzie komunikat typu: 

(13)Permission denied: exec of '/var/www/htdocs/virtuals/collectd/data/cgi-bin/collection.modified.cgi' failed,

Łatki, łatki do skryptów CGI

Poniżej lista poprawek, które trzeba nałożyć na oryginalne pliki w celu poprawnego działania. Chodzi głównie o ścieżki (zmiany w PERLu) jak również rozwój samego Collect Demona.

Łatanie pliku JS

Zgodnie z poprawką na GitHub-ie trzeba dodać poniższy patch (albo skasować linie jak w/w poprawce): 

--- base.js.orig      2012-12-31 01:51:09.000000000 +0100
+++ base.js  2014-09-12 01:17:17.915656805 +0200
@@ -143,11 +143,12 @@
     $.extend(params, new_params);
     var url = original_url.split('?')[0] + '?';

+/**
     // The backend returns absolute URLs
     if (url.charAt(0) == '/') {
         url = url.substring(1, url.length);
     }
-
+**/
     for (key in params) {
         if (params[key] !== '' || params[key] === 0) {
         url += key + '=' + params[key] + ';';

Łatanie pliku graphdefs.cgi

Jest to plik pozwalający na wczytanie definicji RRD. Ale po pierwsze trzeba mu nadać uprawnienia wykonywalne: 

chmod +x /var/www/htdocs/virtuals/collectdweb/data/cgi-bin/graphdefs.cgi

a po drugie nieco go "poprawić": 

--- graphdefs.cgi.orig  2012-12-31 01:51:09.000000000 +0100
+++ graphdefs.cgi       2016-02-10 14:36:42.236505826 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/local/bin/perl

 # Collectd-web - graphdefs.cgi
 # Copyright (C) 2009-2010  Kenneth Belitzky
@@ -19,7 +19,7 @@
 use strict;
 use warnings;

-use JSON ('objToJson');
+use JSON ('to_json');
 use CGI (':cgi');

 our $GraphDefs;
@@ -27,7 +27,7 @@ load_graph_definitions();

 my $q = CGI->new;

-my $response = objToJson({'graph_defs' => $GraphDefs});
+my $response = to_json({'graph_defs' => $GraphDefs});
 print $q->header('application/json');
 print $response;

Łatanie pliku time.cgi

--- time.cgi.orig       2012-12-31 01:51:09.000000000 +0100
+++ time.cgi    2016-02-10 14:36:42.236505826 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/local/bin/perl

 # Collectd-web - time.cgi
 # Copyright (C) 2009-2010  Kenneth Belitzky

Dodanie konfiguracji dla skryptów webowych do collectd

# spróbuję to dodać do unimaster-a
#
echo "datadir: \"/var/db/collectd/rrd/\"" > /usr/local/etc/collectd-web.conf

Konfiguracja apache

Konfiguracja dla Apache składa się z dwóch elementów: definicji katalogu1 jak również Alias oraz ScriptAlias dla wybranej wirtualki: 

          Alias /stats/ "/var/www/htdocs/virtuals/collectdweb/data/"
          ScriptAlias /cgi-bin/ "/var/www/htdocs/virtuals/collectdweb/data/cgi-bin/"

{i}  (c) 2004 - 2026 BSD Serwis Krzysztof Stryjek. W przypadku błędów, poprawek proszę kontaktować się z administratorem wiki.

  1. Definicja jest już wykonana w repozytorium CVS/SVN w pliku 010-collectd.conf (1 2)

CollectDaemon (ostatnio edytowane 2019-08-21 13:30:25 przez wtps0n)