* Reenable Zabbix. Added some checks to monitor the Hydra queue. * Load the coretemp module everywhere so that we can see when the buildfarm catches fire :-)
* Reenable Zabbix. Added some checks to monitor the Hydra queue. * Load the coretemp module everywhere so that we can see when the buildfarm catches fire :-) svn path=/configurations/trunk/tud/; revision=20054
Eelco Dolstra committed
Feb 16, 2010 at 14:35 UTC
78ad65ecd4331297181dde76b89e33c0c2b03fdf
2 files changed
+10
-5
cartman.nix
+8
-5
@@ -154,6 +154,7 @@ rec {
154
host all all ::1/128 md5
155
host all all 192.168.1.18/32 md5
156
host all all 130.161.159.80/32 md5
157
+ host all all 94.208.32.143/32 md5
158
'';
159
};
160
@@ -214,11 +215,9 @@ rec {
215
logo = "/serg-logo.png";
216
};
217
}
217
- /*
218
{ serviceType = "zabbix";
219
urlPrefix = "/zabbix";
220
}
221
- */
221
];
222
servedDirs = [
223
{ urlPath = "/releases";
@@ -360,7 +359,7 @@ rec {
359
360
ProxyRequests Off
361
ProxyPreserveHost On
363
- ProxyPass / http://hydra:3000/
362
+ ProxyPass / http://hydra:3000/ retry=5
363
ProxyPassReverse / http://hydra:3000/
364
'';
365
}
@@ -448,10 +447,14 @@ rec {
447
];
448
};
449
451
- /*
450
zabbixAgent.enable = true;
451
+ zabbixAgent.extraConfig =
452
+ ''
453
+ UserParameter=hydra.queue.total,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from builds where finished = 0'
454
+ UserParameter=hydra.queue.building,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from builds natural join BuildSchedulingInfo where finished = 0 and busy = 1'
455
+ '';
456
+
457
zabbixServer.enable = true;
454
- */
458
459
};
460
common.nix
+2
@@ -1,6 +1,8 @@
1
{ config, pkgs, ... }:
2
3
{
4
+ boot.kernelModules = [ "coretemp" ];
5
+
6
environment.systemPackages = [ pkgs.emacs pkgs.subversion ];
7
8
services.sshd.enable = true;