diff options
| author | Joachim Tingvold <joachim@tingvold.com> | 2015-04-02 23:37:38 +0200 |
|---|---|---|
| committer | root <root@einstein.tg15.gathering.org> | 2015-04-02 23:37:38 +0200 |
| commit | 247524e087a9d44eba3cca6f5f2e50764027e45c (patch) | |
| tree | 688b6df347c74391917ba3f0eaccc39bed9b7e7e | |
| parent | a4fe4862c69d22ec8a2068bfc1f93a9d3d08d92e (diff) | |
More changes. Lawl.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | clients/fetch-cubemap-munin.sh | 4 | ||||
| -rwxr-xr-x | clients/snmpfetchng.pl | 2 | ||||
| -rwxr-xr-x | web/nms-public.gathering.org/weathermap.pl | 18 |
4 files changed, 22 insertions, 3 deletions
@@ -15,6 +15,7 @@ include/tgmanage.cfg.sh planning/planning web/.htpasswd web/.htpasswd.munin +fap/tools/generate_distro_config_ae_event-options/ *.swp diff --git a/clients/fetch-cubemap-munin.sh b/clients/fetch-cubemap-munin.sh index 7dc1526..2beb8bc 100755 --- a/clients/fetch-cubemap-munin.sh +++ b/clients/fetch-cubemap-munin.sh @@ -5,6 +5,6 @@ epoch_to=`date +%s` let "epoch_from = epoch_to - (60 * 60 * 24)" -wget -qO"/root/tgmanage/examples/tg15/streamstats/cubemap_maggie_detailed_-`date +%Y%m%d_%H%M`.png" "http://munin.tg15.gathering.org/munin-cgi/munin-cgi-graph/tg15.gathering.org/maggie.tg15.gathering.org/cubemap-pinpoint=$epoch_from,$epoch_to.png?&lower_limit=&upper_limit=&size_x=1280&size_y=720" -wget -qO"/root/tgmanage/examples/tg15/streamstats/cubemap_seamus_detailed_-`date +%Y%m%d_%H%M`.png" "http://munin.tg15.gathering.org/munin-cgi/munin-cgi-graph/tg15.gathering.org/seamus.tg15.gathering.org/cubemap-pinpoint=$epoch_from,$epoch_to.png?&lower_limit=&upper_limit=&size_x=1280&size_y=720" +wget -qO"/root/tgmanage/examples/tg15/streamstats/cubemap_maggie_detailed-`date +%Y%m%d-%H%M`.png" "http://munin.tg15.gathering.org/munin-cgi/munin-cgi-graph/tg15.gathering.org/maggie.tg15.gathering.org/cubemap-pinpoint=$epoch_from,$epoch_to.png?&lower_limit=&upper_limit=&size_x=1280&size_y=720" +wget -qO"/root/tgmanage/examples/tg15/streamstats/cubemap_seamus_detailed-`date +%Y%m%d-%H%M`.png" "http://munin.tg15.gathering.org/munin-cgi/munin-cgi-graph/tg15.gathering.org/seamus.tg15.gathering.org/cubemap-pinpoint=$epoch_from,$epoch_to.png?&lower_limit=&upper_limit=&size_x=1280&size_y=720" diff --git a/clients/snmpfetchng.pl b/clients/snmpfetchng.pl index 67fc1c7..fa7c227 100755 --- a/clients/snmpfetchng.pl +++ b/clients/snmpfetchng.pl @@ -121,7 +121,7 @@ sub ckcall $dbh->commit; } my @values = ('ifName','ifHighSpeed','ifHCOutOctets','ifHCInOctets'); -my $query = "INSERT INTO polls2 (switch,time"; +my $query = "INSERT INTO polls (switch,time"; foreach my $val (@values) { $query .= ",$val"; } diff --git a/web/nms-public.gathering.org/weathermap.pl b/web/nms-public.gathering.org/weathermap.pl new file mode 100755 index 0000000..41aca39 --- /dev/null +++ b/web/nms-public.gathering.org/weathermap.pl @@ -0,0 +1,18 @@ +#! /usr/bin/perl +use strict; +use warnings; +use CGI; +use File::Copy; + +my $cgi = CGI->new; +my $img_filename = "/root/tgmanage/web/nms-public.gathering.org/weathermap.png"; + +# this must be done for windows +binmode STDOUT; + +# flush headers +$|=1; + +# print the image +print $cgi->header(-type=>'image/png; charset=utf-8', -refresh=>'10; weathermap.pl'); +copy "$img_filename", \*STDOUT; |