Skip to content

Commit e2f9e17

Browse files
committed
v1.0.
Created memory filter/view for the available queues/hostgroups. In memory view each node is shown as once rectangle and it is displayed as a certain color depending on how much memory is being used by that node. Introduced more logging capabilities for errors which cause daemon death. Prepping for the addition of more host-groups to be displayed. Change the way the daemon finds information pertaining to the UGE, it now uses 'qstat -F' vs 'qstat -f'. This way the daemon can find a lot more information. Added the memory information to the node pages, nodes are still a link in the memory view/filter.
1 parent 89975ac commit e2f9e17

File tree

6 files changed

+329
-60
lines changed

6 files changed

+329
-60
lines changed

README

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
_____ _____ _____ ____ ___ ___ ____
2-
/ ____| __ \ / ____| / __ \ / _ \ / _ \ |___ \
3-
| | | |__) | | | | | |_ _ ___ _ _ ___ _ __ ___ __ _ _ __ | | | | (_) | __) |
4-
| | | _ /| | | | | | | | |/ _ \ | | |/ _ \ '_ ` _ \ / _` | '_ \| | | |> _ < |__ <
5-
| |____| | \ \| |____ | |__| | |_| | __/ |_| | __/ | | | | | (_| | |_) | |_| | (_) | ___) |
6-
\_____|_| \_\\_____| \___\_\\__,_|\___|\__,_|\___|_| |_| |_|\__,_| .__/ \___(_)___(_)____/
7-
| |
8-
|_|
1+
_____ _____ _____ ____ __ __ __ ___
2+
/ ____| __ \ / ____| / __ \ | \/ | /_ | / _ \
3+
| | | |__) | | | | | |_ _ ___ _ _ ___| \ / | __ _ _ __ | || | | |
4+
| | | _ /| | | | | | | | |/ _ \ | | |/ _ \ |\/| |/ _` | '_ \| || | | |
5+
| |____| | \ \| |____ | |__| | |_| | __/ |_| | __/ | | | (_| | |_) | || |_| |
6+
\_____|_| \_\\_____| \___\_\\__,_|\___|\__,_|\___|_| |_|\__,_| .__/|_(_)___/
7+
| |
8+
|_|
99
--------------------------------------------------------------------------------------------
1010

1111
* The CRC Queue map was started in early August, 2016 by intern Cody Kankel
@@ -24,6 +24,18 @@
2424
It has been tested with apache2 and PHP 7.0. A working equivalent of those is
2525
required for this to work correctly.
2626

27+
* What it will create:
28+
The daemon will spit out a few files as said in How it Works, and those files are
29+
partial html pages which will be pieced together with php. Eventually, a series of
30+
pages will be created on your webserver. Once everything is up and running, if you
31+
access your webserver through a browser you will be dumped at whatever your index
32+
is. I am planning on creating one for the Queue-Map itself. For now, there will be
33+
the classic listing of all available links within the server. There will be a page
34+
for the Debug Queue, a memory filter for the Debug Queue, Pening Jobs, the General
35+
Access hostgroup, a memory filter for the General Access hostgroup, and a page
36+
for every node which is in the previous hostgroups/queues. For detailed information
37+
and screen shots see : https://github.com/CodyKank/Queue-Map/wiki
38+
2739
* NOTE: the python daemon on the front end is python 3.4.0 FYI.
2840

2941
* Installation:
@@ -107,4 +119,4 @@
107119

108120
* To See a few screenshots, check out the wikipage on Github: https://github.com/CodyKank/Queue-Map/wiki
109121

110-
Version: 0.8.3-Beta
122+
Version: 1.0

curl_queue_files.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@
44
#like the www directory in my Public afs space.
55

66
#local info:
7-
pswd="LOCAL(SERVER) PASSWORD HERE!!!" #or configure sudoers file
7+
pswd="LOCAL PASSWORD HERE!! OR CHANGE SUDOERS FILE!!!" #or configure sudoers file
88

9-
desired_path="DESIRED PATH FOR SERVER HERE!" #typicaly /var/www/html (you don't need the last '/')
9+
desired_path="/var/www/html" #typicaly /var/www/html (you don't need the last '/')
1010

11-
curl_url="URL FOR CURL GOES HERE" #Don't need last '/'
12-
#Gathering files from CRCFE using wget
11+
curl_url="CURL URL HERE!!!!!!!!!!!!!!!!!" #Don't need last '/'
12+
#Gathering files from CRCFE using curl
1313

1414
curl -o index-long.html $curl_url/index-long.html
1515

16+
curl -o long_mem.html $curl_url/long_mem.html
17+
1618
curl -o index-debug.html $curl_url/index-debug.html
1719

20+
curl -o debug_mem.html $curl_url/debug_mem.html
21+
1822
curl -o pending_content.html $curl_url/pending.html
1923

2024
curl -o sub-debug.tar.gz $curl_url/sub-debug.tar.gz
@@ -25,8 +29,12 @@ curl -o sub-long.tar.gz $curl_url/sub-long.tar.gz
2529

2630
echo $pswd | sudo -S mv index-long.html $desired_path/Long/index-long.html
2731

32+
echo $pswd | sudo -S mv long_mem.html $desired_path/Long-memory/index-long.html
33+
2834
echo $pswd | sudo -S mv index-debug.html $desired_path/Debug/index-debug.html
2935

36+
echo $pswd | sudo -S mv debug_mem.html $desired_path/Debug-memory/index-debug.html
37+
3038
echo $pswd | sudo -S mv pending_content.html $desired_path/Pending/pending_content.html
3139

3240
#Setting up node files:

curl_setup.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
desired_path="/var/www/html" #you can change this if need be
1010

1111
#CRC info to gather files
12-
webpage_url="URL FOR CRC FILES HERE"
12+
webpage_url="CURL URL HERE !!!!!!!!!!!!!"
1313

1414
#Local info to mv files to protected areas
15-
psword="LOCAL (WEBSERVER) SUDO PASSWORD"
15+
psword="LOCAL PASSWORD OR CHANGE SUDOERS FILE!!!!!!!!!!!"
1616
long_file="long_nodes.txt" #These can stay this way
1717
debug_file="debug_nodes.txt" # "
1818

@@ -23,11 +23,18 @@ echo $psword | sudo -S mkdir $desired_path/Debug
2323
echo $psword | sudo -S mkdir $desired_path/Long
2424
echo $psword | sudo -S mkdir $desired_path/Pending
2525

26+
#Creating Memory-Dir's
27+
echo $psword | sudo -S mkdir $desired_path/Debug-memory
28+
echo $psword | sudo -S mkdir $desired_path/Long-memory
29+
2630
echo "Moving index's to their rightful places . . ."
2731
echo $psword | sudo -S cp index-long.php $desired_path/Long/index.php
32+
echo $psword | sudo -S cp index-long.php $desired_path/Long-memory/index.php
2833
echo $psword | sudo -S cp index-debug.php $desired_path/Debug/index.php
34+
echo $psword | sudo -S cp index-debug.php $desired_path/Debug-memory/index.php
2935
echo $psword | sudo -S cp index-pending.php $desired_path/Pending/index.php
3036

37+
3138
echo "Transferring templates to $desired_path . . ."
3239
echo $psword | sudo -S cp -r templates $desired_path/templates
3340

0 commit comments

Comments
 (0)