To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 26440678 authored by Reto Da Forno's avatar Reto Da Forno

excessive 'sshd alignment trap' logging fixed

git-svn-id: svn://svn.ee.ethz.ch/flocklab/trunk/shared@3339 613144d5-4475-0410-9df3-888732ad2c88
parent 92628006
......@@ -54,12 +54,14 @@ filter f_warn { level(warn); };
filter f_err { level(err); };
filter f_crit { level(crit); };
filter f_noalignmenttrap { not match("Alignment trap: sshd"); };
log { source(src); filter(f_auth); destination(authlog); };
log { source(src); filter(f_syslog); filter(f_nocron); filter(f_nodebug); destination(syslog); };
log { source(src); filter(f_syslog); filter(f_nocron); filter(f_nodebug); filter(f_noalignmenttrap); destination(syslog); };
log { source(src); filter(f_cron_nocmd); filter(f_nodebug); destination(syslog); };
log { source(src); filter(f_cron); filter(f_nodebug); destination(cron); };
log { source(src); filter(f_daemon); filter(f_nodebug); destination(daemon); };
log { source(src); filter(f_kern); filter(f_nodebug); destination(kern); };
log { source(src); filter(f_kern); filter(f_nodebug); filter(f_noalignmenttrap); destination(kern); };
log { source(src); filter(f_lpr); filter(f_nodebug); destination(lpr); };
log { source(src); filter(f_user); filter(f_nodebug); destination(user); };
log { source(src); filter(f_uucp); filter(f_nodebug); destination(uucp); };
......@@ -70,8 +72,8 @@ log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
log { source(src); filter(f_news); filter(f_err); destination(newserr); };
log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
log { source(src); filter(f_debug); destination(debug); };
log { source(src); filter(f_messages); destination(messages); };
log { source(src); filter(f_emergency); destination(console); };
log { source(src); filter(f_messages); filter(f_noalignmenttrap); destination(messages); };
log { source(src); filter(f_emergency); filter(f_noalignmenttrap); destination(console); };
log { source(src); filter(f_ppp); filter(f_nodebug); destination(ppp); };
log { source(src); destination(console_all); };
log { source(src); filter(f_noalignmenttrap); destination(console_all); };
log { source(src); filter(f_synclog); destination(synclog); };
#!/bin/bash
# general purpose update script, can be utilized to execute commands on all observers
#
# observer list: 001 002 003 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204
for OBS in 001 002 003 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204
do
echo "updating observer ${OBS}..."
#ssh flocklab-observer${OBS} "mount -o remount,rw /"
#scp syslog-ng.conf flocklab-observer${OBS}:/etc/syslog-ng.conf
#ssh flocklab-observer${OBS} "mount -o remount,ro / ; /etc/init.d/syslog restart"
done
......@@ -130,8 +130,9 @@
<table>
<tr><td><b>Flocklab users</b></td></tr>
<tr><td>Number of registered users: </td><td class="numberField"><?php echo $stats['registered']; ?></td></tr>
<tr><td>Number of active users: </td><td class="numberField"><?php echo $stats['active']; ?></td></tr>
<tr><td>Number of different countries: </td><td class="numberField"><?php echo $stats['num_countries']; ?></td></td></tr>
<tr><td>Number of different institutions: </td><td class="numberField"><?php echo $stats['num_institutions']; ?></td></td></tr>
<tr><td>Number of different institutions: </td><td class="numberField"><?php echo $stats['num_institutions']; ?></td></td></tr>
<tr><td></td></tr>
<tr><td><b>Tests</b></td></tr>
<tr><td>Total number of tests since 2012: </td><td class="numberField"><?php echo $stats['num_tests']; ?></td></td></tr>
......@@ -159,7 +160,7 @@
<div class="chartContainer"><div class="chartTitle">Number of active users by year</div><canvas id="chartUsersYear" class="chartArea"></canvas></div>
<div class="chartContainer"><div class="chartTitle">Total number of tests by year</div><canvas id="chartTestsYear" class="chartArea"></canvas></div>
<div class="chartContainer"><div class="chartTitle">Testbed utilization by year</div><canvas id="chartUtilizationYear" class="chartArea"></canvas></div>
<div class="chartContainer"><div class="chartTitle">Weekly testbed utilization of last 12 months</div><canvas id="chartUtilizationWeek" class="chartArea"></canvas></div>
<div class="chartContainer"><div class="chartTitle">Weekly testbed utilization over last 12 months</div><canvas id="chartUtilizationWeek" class="chartArea"></canvas></div>
<div class="chartContainer"><div class="chartTitle">Test durations (cumulative distribution function)</div><canvas id="chartTestRuntime" class="chartArea"></canvas></div>
<div class="chartContainer"><div class="chartTitle">Number of tests per platform and year</div><canvas id="chartPlatformsYear" class="chartArea"></canvas></div>
<div class="chartContainer"><div class="chartTitle">Services used in tests</div><canvas id="chartServicesYear" class="chartArea"></canvas></div>
......
......@@ -19,12 +19,19 @@ function collect_stats($filename)
// --- start data collection ---
//$citations = shell_exec("./scripts/scholar.py -C 10650874796619438829 -c 1 | grep Citations -m 1 | awk '{ print $2 }'"); // citation count
$db = db_connect();
$sql = "select count(*) as num from tbl_serv_users";
$rs = mysql_query($sql) or flocklab_die('Cannot get statistics from database because: ' . mysql_error());
$row = mysql_fetch_array($rs);
$usercnt = $row['num'];
$sql = "select COUNT(*) as num from tbl_serv_users where datediff(DATE_SUB(DATE_SUB(CURDATE(),INTERVAL (DAY(CURDATE())-1) DAY),INTERVAL 12 MONTH),last_login) <=0 and is_active=1";
$rs = mysql_query($sql) or flocklab_die('Cannot get statistics from database because: ' . mysql_error());
$row = mysql_fetch_array($rs);
$usercntactive = $row['num'];
$sql = 'select country, count(country) as num from tbl_serv_users group by country';
$rs = mysql_query($sql) or flocklab_die('Cannot get statistics from database because: ' . mysql_error());
$countries['others'] = 0;
......@@ -226,9 +233,11 @@ function collect_stats($filename)
$new_stats = "
[general]
last_update = ".(string)time()."
paper_citations = ".$citations."
[users]
registered = ".(string)$usercnt."
active = ".(string)$usercntactive."
num_countries = ".(string)$countrycnt."
country = \"".str_replace('"', '\'', serialize($countries))."\"
num_institutions = ".(string)$institutioncnt."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment