From: Barış Metin Date: Thu, 22 Oct 2009 07:59:29 +0000 (+0000) Subject: - add install_date X-Git-Tag: 4.3-rc14~4 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=43d4079f46235758bd9bcda1721fe4d9d8d3dcfd;p=build.git - add install_date Setting tag Monitor-3.0-24 --This line, and those below, will be ignored-- Please write a changelog for this new tag in the section above DIFF========= Index: nodequery.py =================================================================== --- nodequery.py (.../tags/Monitor-3.0-23) (révision 15400) +++ nodequery.py (.../trunk) (révision 15400) @@ -38,6 +38,8 @@ fbnode['bootcd_version'] = "unknown" if not fbnode['boot_server']: fbnode['boot_server'] = "unknown" + if not fbnode['install_date']: + fbnode['install_date'] = "unknown" fbnode['pcu'] = color_pcu_state(fbnode) if not fields: @@ -60,7 +62,7 @@ #print "ERROR!!!!!!!!!!!!!!!!!!!!!" pass - print "%(hostname)-45s | %(date_checked)11.11s | %(boot_state)5.5s| %(observed_status)8.8s | %(ssh_status)5.5s | %(pcu)6.6s | %(bootcd_version)6.6s | %(boot_server)s | %(kernel_version)s" % fbnode + print "%(hostname)-45s | %(date_checked)11.11s | %(boot_state)5.5s| %(observed_status)8.8s | %(ssh_status)5.5s | %(pcu)6.6s | %(bootcd_version)6.6s | %(boot_server)s | %(install_date)s | %(kernel_version)s" % fbnode else: format = "" for f in fields: Index: web/MonitorWeb/monitorweb/controllers.py =================================================================== --- web/MonitorWeb/monitorweb/controllers.py (.../tags/Monitor-3.0-23) (révision 15400) +++ web/MonitorWeb/monitorweb/controllers.py (.../trunk) (révision 15400) @@ -54,6 +54,7 @@ kernel_version = widgets.CheckBox(label="Kernel") bootcd_version = widgets.CheckBox(label="BootCD") boot_server = widgets.CheckBox(label="Boot Server") + install_date = widgets.CheckBox(label="Installation Date") observed_status = widgets.CheckBox(label="Observed Status") uptime = widgets.CheckBox(label="Uptime") traceroute = widgets.CheckBox(label="Traceroute") Index: web/MonitorWeb/monitorweb/templates/nodescanhistory.kid =================================================================== --- web/MonitorWeb/monitorweb/templates/nodescanhistory.kid (.../tags/Monitor-3.0-23) (révision 15400) +++ web/MonitorWeb/monitorweb/templates/nodescanhistory.kid (.../trunk) (révision 15400) @@ -63,6 +63,7 @@ kernel BootCD Boot Server + Installation Date Last_contact @@ -78,6 +79,7 @@ + Index: web/MonitorWeb/monitorweb/templates/node_template.kid =================================================================== --- web/MonitorWeb/monitorweb/templates/node_template.kid (.../tags/Monitor-3.0-23) (révision 15400) +++ web/MonitorWeb/monitorweb/templates/node_template.kid (.../trunk) (révision 15400) @@ -16,6 +16,7 @@ kernel BootCD Boot Server + Installation Date last_contact @@ -43,6 +44,7 @@ + Index: upgrade/monitor-server-3.0-23.sql =================================================================== --- upgrade/monitor-server-3.0-23.sql (.../tags/Monitor-3.0-23) (révision 0) +++ upgrade/monitor-server-3.0-23.sql (.../trunk) (révision 15400) @@ -0,0 +1,3 @@ + +ALTER TABLE findbadnoderecord ADD COLUMN install_date varchar DEFAULT NULL; +ALTER TABLE findbadnoderecord_history ADD COLUMN install_date varchar DEFAULT NULL; Index: monitor/database/info/findbad.py =================================================================== --- monitor/database/info/findbad.py (.../tags/Monitor-3.0-23) (révision 15400) +++ monitor/database/info/findbad.py (.../trunk) (révision 15400) @@ -39,6 +39,7 @@ kernel_version = Field(String,default=None) bootcd_version = Field(String,default=None) boot_server = Field(String,default=None) + install_date = Field(String,default=None) nm_status = Field(String,default=None) fs_status = Field(String,default=None) iptables_status = Field(String,default=None) Index: monitor/scanapi.py =================================================================== --- monitor/scanapi.py (.../tags/Monitor-3.0-23) (révision 15400) +++ monitor/scanapi.py (.../trunk) (révision 15400) @@ -238,6 +238,7 @@ echo ' "bmlog":"'`ls /tmp/bm.log`'",' echo ' "bootcd_version":"'`cat /mnt/cdrom/bootme/ID`'",' echo ' "boot_server":"'`cat /mnt/cdrom/bootme/BOOTSERVER`'",' + echo ' "install_date":"'`python -c "import os,time,stat; print time.ctime(os.stat('/usr/boot/plnode.txt')[stat.ST_CTIME])"`'",' echo ' "nm_status":"'`ps ax | grep nm.py | grep -v grep`'",' echo ' "dns_status":"'`host boot.planet-lab.org 2>&1`'",' echo ' "iptables_status":"'`iptables -t mangle -nL | awk '$1~/^[A-Z]+$/ {modules[$1]=1;}END{for (k in modules) {if (k) printf "%s ",k;}}'`'",' @@ -262,6 +263,7 @@ else: values.update({'kernel_version': "", 'bmlog' : "", 'bootcd_version' : '', 'boot_server' : '', + 'install_date' : '', 'nm_status' : '', 'fs_status' : '', 'uptime' : '', --- diff --git a/coblitz-tags.mk b/coblitz-tags.mk index 7e10fb01..e21f562b 100644 --- a/coblitz-tags.mk +++ b/coblitz-tags.mk @@ -30,7 +30,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-29 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-33 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-23 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-24 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/onelab-tags.mk b/onelab-tags.mk index 12569e3e..8f09fc14 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -36,7 +36,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-33 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-23 +Monitor-SVNPATH := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-24 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk index 35f84760..75c6fe94 100644 --- a/planetbridge-tags.mk +++ b/planetbridge-tags.mk @@ -30,7 +30,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-33 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-23 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-24 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index e3b4964a..77fe7fef 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -39,7 +39,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-33 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-23 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-24 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/planetlab-tags.mk b/planetlab-tags.mk index 8f8b448c..f6a579be 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -31,7 +31,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-29 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-33 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-23 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-24 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 diff --git a/trellis-tags.mk b/trellis-tags.mk index 253c6c7e..39553216 100644 --- a/trellis-tags.mk +++ b/trellis-tags.mk @@ -35,7 +35,7 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLC drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-33 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-23 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-24 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-5 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-12 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8