From c981221e1aa839c3ba3e2fd11d89abf830a2fc38 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Tue, 9 Jun 2009 22:34:42 +0000 Subject: [PATCH] fixed what looked like a typo in pculist.kid, restores 'view all' use explicit model name, rather than translate names in pcucontrol/reboot.py use TurboGears from f8 as base for install. disable crazy pam module to let crond work correctly. there is no pcu_id for messages. run synciwithplc in automate-default --- Monitor.spec | 22 ++++++++++--------- automate-default.sh | 1 + monitor/wrapper/emailTxt.py | 2 +- pcucontrol/reboot.py | 5 +++-- pcutest.py | 1 + .../monitorweb/templates/pculist.kid | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Monitor.spec b/Monitor.spec index 6c64a73..45a791e 100644 --- a/Monitor.spec +++ b/Monitor.spec @@ -53,6 +53,8 @@ Group: Applications/System Requires: python Requires: python-setuptools-devel +Requires: python-peak-util-extremes +Requires: TurboGears Requires: openssh-clients Requires: perl-libwww-perl @@ -209,16 +211,16 @@ rm -rf $RPM_BUILD_ROOT /%{_initrddir}/monitor-runlevelagent %post server-deps -easy_install --build-directory /var/tmp -UZ Elixir -easy_install --build-directory /var/tmp -UZ ElementTree -# TODO: something is bad wrong with this approach. -#easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/2.5/E/Extremes/Extremes-1.1-py2.5.egg -#easy_install --build-directory /var/tmp -UZ "Paste==1.5.1" -#easy_install --build-directory /var/tmp -UZ "PasteDeploy==1.3.1" - -easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz -easy_install --build-directory /var/tmp -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg - +#easy_install --build-directory /var/tmp -UZ Elixir +#easy_install --build-directory /var/tmp -UZ ElementTree +## TODO: something is bad wrong with this approach. +##easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/2.5/E/Extremes/Extremes-1.1-py2.5.egg +#easy_install --build-directory /var/tmp -UZ http://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.5.3.tar.gz +#easy_install --build-directory /var/tmp -UZ http://files.turbogears.org/eggs/TurboGears-1.0.7-py2.5.egg + +if grep 'pam_loginuid.so' /etc/pam.d/crond ; then + sed -i -e 's/^session required pam_loginuid.so/#session required pam_loginuid.so/g' /etc/pam.d/crond +fi # NOTE: add the default xml stuff if it's not already in the default xml config. if ! grep '' /etc/planetlab/default_config.xml ; then sed -i 's|| \n Monitor Service Configuration\n Monitor\n \n \n Enabled\n true\n Enable on this machine.\n \n \n \n \n \n \n \n \n Hostname\n pl-virtual-06.cs.princeton.edu\n The fully qualified hostname.\n \n \n IP Address\n \n The IP address of the monitor server.\n \n \n \n |' /etc/planetlab/default_config.xml diff --git a/automate-default.sh b/automate-default.sh index 24a9e61..2858c63 100755 --- a/automate-default.sh +++ b/automate-default.sh @@ -60,6 +60,7 @@ fi #TODO: should add a call to ssh-add -l to check if the keys are loaded or not. source ${MONITOR_SCRIPT_ROOT}/agent.sh +${MONITOR_SCRIPT_ROOT}/syncwithplc.py $DATE || : echo "Performing FindAll Nodes" ######################### diff --git a/monitor/wrapper/emailTxt.py b/monitor/wrapper/emailTxt.py index dee06f7..cd3ab2a 100644 --- a/monitor/wrapper/emailTxt.py +++ b/monitor/wrapper/emailTxt.py @@ -235,7 +235,7 @@ Thank you very much for your help, the host did not come back online. You may be able to learn more by visiting this link: - https://monitor.planet-lab.org/monitor/pcuview?pcu_id=%(pcu_id)s + https://monitor.planet-lab.org/monitor/pcuview?loginbase=%(loginbase)s We need your help resolving this issue in a few ways: diff --git a/pcucontrol/reboot.py b/pcucontrol/reboot.py index 5744141..30c7cb5 100755 --- a/pcucontrol/reboot.py +++ b/pcucontrol/reboot.py @@ -365,7 +365,7 @@ def model_to_object(modelname): elif "ePowerSwitch" in modelname: return ePowerSwitchNew elif "IPMI" in modelname: - return IPMI + return OpenIPMI elif "BlackBoxPSMaverick" in modelname: return BlackBoxPSMaverick elif "PM211MIP" in modelname: @@ -452,7 +452,8 @@ def reboot_test_new(nodename, values, verbose, dryrun): values.update(values['plc_pcu_stats']) try: - modelname = convert_oldmodelname_to_newmodelname(values['model'], values['pcu_id']) + #modelname = convert_oldmodelname_to_newmodelname(values['model'], values['pcu_id']) + modelname = values['model'] if modelname: object = eval('%s(values, verbose)' % modelname) rb_ret = object.reboot(values[nodename], dryrun) diff --git a/pcutest.py b/pcutest.py index a99e907..39ef7dd 100755 --- a/pcutest.py +++ b/pcutest.py @@ -7,6 +7,7 @@ import time from monitor import config api06 = plc.PLC(plc.Auth(config.API06_AUTH_USER, config.API06_AUTH_PASSWORD).auth, config.API06_SERVER) +api06 = plc.api if True: # update old model names to new model names. diff --git a/web/MonitorWeb/monitorweb/templates/pculist.kid b/web/MonitorWeb/monitorweb/templates/pculist.kid index debed84..db3cef4 100644 --- a/web/MonitorWeb/monitorweb/templates/pculist.kid +++ b/web/MonitorWeb/monitorweb/templates/pculist.kid @@ -27,7 +27,7 @@ from links import * size='3' maxlength='3' /> reset visible size + onmousedown='plekit_pagesize_reset("pculist","pculist_pagesize", 999);' /> -- 2.43.0