From cf98960e6c248bd1ab2b2ec15a764c0b7a616876 Mon Sep 17 00:00:00 2001 From: slerena Date: Mon, 6 Apr 2009 11:02:05 +0000 Subject: [PATCH] 2009-04-06 Sancho Lerena * godmode/setup/setup.php * godmode/setup/setup_visuals.php * include/config_process.php, * include/functions_config.php: Added new parameter for status icons. Old config (fontpath and attachment dir are now manageable in setup). * include/functions_ui.php, godmode/servers/modificar_server.php operation/agentes/status_monitor.php operation/agentes/estado_agente.php operation/agentes/bulbs.php operation/agentes/estado_monitores.php operation/agentes/tactical.php operation/servers/view_server.php: Added support for custom status images. * images/status_sets: Added three new status images pack: Default color icons, faces and color with text. * reporting/fgraph.php: Temporal FIX for problem in access graphs that takes 100% Apache CPU !!!. Need final fix for this. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 24 ++++++ .../godmode/servers/modificar_server.php | 12 ++- pandora_console/godmode/setup/setup.php | 8 ++ .../godmode/setup/setup_visuals.php | 8 ++ .../status_sets/color_text/agent_critical.png | Bin 0 -> 572 bytes .../status_sets/color_text/agent_down.png | Bin 0 -> 696 bytes .../status_sets/color_text/agent_no_data.png | Bin 0 -> 688 bytes .../color_text/agent_no_monitors.png | Bin 0 -> 528 bytes .../status_sets/color_text/agent_ok.png | Bin 0 -> 460 bytes .../status_sets/color_text/agent_warning.png | Bin 0 -> 817 bytes .../status_sets/color_text/alert_disabled.png | Bin 0 -> 659 bytes .../status_sets/color_text/alert_fired.png | Bin 0 -> 433 bytes .../color_text/alert_not_fired.png | Bin 0 -> 460 bytes .../color_text/module_critical.png | Bin 0 -> 572 bytes .../status_sets/color_text/module_ok.png | Bin 0 -> 460 bytes .../status_sets/color_text/module_warning.png | Bin 0 -> 817 bytes .../status_sets/color_text/server_down.png | Bin 0 -> 572 bytes .../status_sets/color_text/server_ok.png | Bin 0 -> 460 bytes .../status_sets/default/agent_critical.png | Bin 0 -> 207 bytes .../images/status_sets/default/agent_down.png | Bin 0 -> 207 bytes .../status_sets/default/agent_no_data.png | Bin 0 -> 207 bytes .../status_sets/default/agent_no_monitors.png | Bin 0 -> 207 bytes .../images/status_sets/default/agent_ok.png | Bin 0 -> 207 bytes .../status_sets/default/agent_warning.png | Bin 0 -> 207 bytes .../status_sets/default/alert_disabled.png | Bin 0 -> 193 bytes .../status_sets/default/alert_fired.png | Bin 0 -> 199 bytes .../status_sets/default/alert_not_fired.png | Bin 0 -> 199 bytes .../status_sets/default/module_critical.png | Bin 0 -> 207 bytes .../images/status_sets/default/module_ok.png | Bin 0 -> 207 bytes .../status_sets/default/module_warning.png | Bin 0 -> 207 bytes .../status_sets/default/server_down.png | Bin 0 -> 218 bytes .../images/status_sets/default/server_ok.png | Bin 0 -> 218 bytes .../status_sets/faces/agent_critical.png | Bin 0 -> 1202 bytes .../images/status_sets/faces/agent_down.png | Bin 0 -> 1206 bytes .../status_sets/faces/agent_no_data.png | Bin 0 -> 1177 bytes .../status_sets/faces/agent_no_monitors.png | Bin 0 -> 1263 bytes .../images/status_sets/faces/agent_ok.png | Bin 0 -> 1232 bytes .../status_sets/faces/agent_warning.png | Bin 0 -> 1176 bytes .../status_sets/faces/alert_disabled.png | Bin 0 -> 1177 bytes .../images/status_sets/faces/alert_fired.png | Bin 0 -> 1202 bytes .../status_sets/faces/alert_not_fired.png | Bin 0 -> 1232 bytes .../status_sets/faces/module_critical.png | Bin 0 -> 1202 bytes .../images/status_sets/faces/module_ok.png | Bin 0 -> 1232 bytes .../status_sets/faces/module_warning.png | Bin 0 -> 1176 bytes .../images/status_sets/faces/server_down.png | Bin 0 -> 1206 bytes .../images/status_sets/faces/server_ok.png | Bin 0 -> 1232 bytes pandora_console/include/config_process.php | 12 --- pandora_console/include/functions_config.php | 21 +++++ pandora_console/include/functions_ui.php | 73 +++++++++++++++--- pandora_console/operation/agentes/bulbs.php | 33 ++++---- .../operation/agentes/estado_agente.php | 19 ++--- .../operation/agentes/estado_monitores.php | 25 ++++-- .../operation/agentes/status_monitor.php | 6 +- .../operation/agentes/tactical.php | 4 +- .../operation/servers/view_server.php | 4 +- pandora_console/reporting/fgraph.php | 13 +++- 56 files changed, 197 insertions(+), 65 deletions(-) create mode 100755 pandora_console/images/status_sets/color_text/agent_critical.png create mode 100755 pandora_console/images/status_sets/color_text/agent_down.png create mode 100755 pandora_console/images/status_sets/color_text/agent_no_data.png create mode 100755 pandora_console/images/status_sets/color_text/agent_no_monitors.png create mode 100755 pandora_console/images/status_sets/color_text/agent_ok.png create mode 100755 pandora_console/images/status_sets/color_text/agent_warning.png create mode 100755 pandora_console/images/status_sets/color_text/alert_disabled.png create mode 100755 pandora_console/images/status_sets/color_text/alert_fired.png create mode 100755 pandora_console/images/status_sets/color_text/alert_not_fired.png create mode 100755 pandora_console/images/status_sets/color_text/module_critical.png create mode 100755 pandora_console/images/status_sets/color_text/module_ok.png create mode 100755 pandora_console/images/status_sets/color_text/module_warning.png create mode 100755 pandora_console/images/status_sets/color_text/server_down.png create mode 100755 pandora_console/images/status_sets/color_text/server_ok.png create mode 100755 pandora_console/images/status_sets/default/agent_critical.png create mode 100755 pandora_console/images/status_sets/default/agent_down.png create mode 100755 pandora_console/images/status_sets/default/agent_no_data.png create mode 100755 pandora_console/images/status_sets/default/agent_no_monitors.png create mode 100755 pandora_console/images/status_sets/default/agent_ok.png create mode 100755 pandora_console/images/status_sets/default/agent_warning.png create mode 100755 pandora_console/images/status_sets/default/alert_disabled.png create mode 100755 pandora_console/images/status_sets/default/alert_fired.png create mode 100755 pandora_console/images/status_sets/default/alert_not_fired.png create mode 100755 pandora_console/images/status_sets/default/module_critical.png create mode 100755 pandora_console/images/status_sets/default/module_ok.png create mode 100755 pandora_console/images/status_sets/default/module_warning.png create mode 100755 pandora_console/images/status_sets/default/server_down.png create mode 100755 pandora_console/images/status_sets/default/server_ok.png create mode 100755 pandora_console/images/status_sets/faces/agent_critical.png create mode 100755 pandora_console/images/status_sets/faces/agent_down.png create mode 100755 pandora_console/images/status_sets/faces/agent_no_data.png create mode 100755 pandora_console/images/status_sets/faces/agent_no_monitors.png create mode 100755 pandora_console/images/status_sets/faces/agent_ok.png create mode 100755 pandora_console/images/status_sets/faces/agent_warning.png create mode 100755 pandora_console/images/status_sets/faces/alert_disabled.png create mode 100755 pandora_console/images/status_sets/faces/alert_fired.png create mode 100755 pandora_console/images/status_sets/faces/alert_not_fired.png create mode 100755 pandora_console/images/status_sets/faces/module_critical.png create mode 100755 pandora_console/images/status_sets/faces/module_ok.png create mode 100755 pandora_console/images/status_sets/faces/module_warning.png create mode 100755 pandora_console/images/status_sets/faces/server_down.png create mode 100755 pandora_console/images/status_sets/faces/server_ok.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 49babe1868..008e540179 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,27 @@ +2009-04-06 Sancho Lerena + + * godmode/setup/setup.php + * godmode/setup/setup_visuals.php + * include/config_process.php, + * include/functions_config.php: Added new parameter for status icons. + Old config (fontpath and attachment dir are now manageable in setup). + + * include/functions_ui.php, + godmode/servers/modificar_server.php + operation/agentes/status_monitor.php + operation/agentes/estado_agente.php + operation/agentes/bulbs.php + operation/agentes/estado_monitores.php + operation/agentes/tactical.php + operation/servers/view_server.php: Added support for custom status + images. + + * images/status_sets: Added three new status images pack: Default color + icons, faces and color with text. + + * reporting/fgraph.php: Temporal FIX for problem in access graphs that + takes 100% Apache CPU !!!. Need final fix for this. + 2009-04-03 Sancho Lerena * include/functions_alerts.php: Fixed another notice. diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 6ab4fffa4d..1f74d028d0 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -84,7 +84,7 @@ if (isset($_GET["server"])) { $table->width = "90%"; $table->class = "databox"; $table->align = array ('',"center","center","center","center","center","center","center"); - $table->head = array (__('Name'),__('Status'),__('IP Address'),__('Description'),__('Type'),__('Started'),__('Updated'),__('Delete')); + $table->head = array (__('Name'),__('Status'),__('Description'),__('Type'),__('Started'),__('Updated'),__('Delete')); foreach ($result as $row) { $server = ""; @@ -104,10 +104,16 @@ if (isset($_GET["server"])) { $server .= ' '; } + + if ($row['status'] == 0) { + $server_status = print_status_image(STATUS_SERVER_DOWN, '', true); + } else { + $server_status = print_status_image(STATUS_SERVER_OK, '', true); + } + $table->data[] = array ( ''.$row["name"].'', - '', - $row["ip_address"], + $server_status, substr($row["description"],0,25), $server, human_time_comparation ($row["laststart"]), diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index ceea7580e2..7417a273c3 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -93,6 +93,14 @@ $table->data[19][1] = print_checkbox ('https', 1, $config["https"], true); $table->data[20][0] = __('Compact CSS and JS into header'); $table->data[20][1] = print_checkbox ('compact_header', 1, $config["compact_header"], true); + +$table->data[25][0] = __('Font path'); +$table->data[25][1] = print_input_text ('fontpath', $config["fontpath"], '', 50, 255, true); + +$table->data[26][0] = __('Attachment store'); +$table->data[26][1] = print_input_text ('attachment_store', $config["attachment_store"], '', 50, 255, true); + + enterprise_hook ('load_snmpforward_enterprise'); echo '
'; diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 0be4a01710..ad441421e4 100644 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -72,6 +72,14 @@ $table->data[7][1] = print_input_text ('block_size', $config["block_size"], '', $table->data[8][0] = __('Use round corners'); $table->data[8][1] = print_checkbox ('round_corner', 1, $config["round_corner"], true); +$table->data[9][0] = __('Status Icon set'); +$iconsets["default"] = __('Colors (Default)'); +$iconsets["faces"] = __('Faces'); +$iconsets["color_text"] = __('Color and text'); + +$table->data[9][1] = print_select ($iconsets, 'status_images_set', $config["status_images_set"], '', '', '', true); + + echo ''; print_input_hidden ('update_config', 1); print_table ($table); diff --git a/pandora_console/images/status_sets/color_text/agent_critical.png b/pandora_console/images/status_sets/color_text/agent_critical.png new file mode 100755 index 0000000000000000000000000000000000000000..4239af2438c31bdcd9688f870af045dc6ecf536a GIT binary patch literal 572 zcmV-C0>k}@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ$ z3Joth=Gd740013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z0004# zNkl1uDmb6w#rCJO&AcElNte}5_tKjUQlaq_+APC|n{tZq-7AJLb zannsiT!i$8i}r_*+Stpv)LPq%NGHXdn4CitjHrGDZ+xOc?XUup0p_EJ(3QQIXNGX-MI>2_Nf+qyG zw#~h5lNX{DARUMEOoq)$rR#LkagdJFHSbiE|78#`XPV5KCYM2=%pCwY@_jBc8EnG< zU_X`m3L+(z-g`Gh`MbW)N-~LT&gV>1UE)U}m}n+FX=kiZbf}%Y%cgmr6Ve zK{*WBD3?D2G>u)$Vy{}I9ELpss{CEw=Qy2i_3m*xjqCerz#YpXYZy!yi%b=ZjCYhH zq3f&-4Y8%TC_jub{iN#tmGqD(Mt=9cg^#9^MU?1?01HJ>%*wl^Ryjjrz0000< KMNUMnLSTZHx%QU; literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/color_text/agent_down.png b/pandora_console/images/status_sets/color_text/agent_down.png new file mode 100755 index 0000000000000000000000000000000000000000..0c720c4170d915c9d396390cdb0ae95870a5349e GIT binary patch literal 696 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 literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/color_text/alert_disabled.png b/pandora_console/images/status_sets/color_text/alert_disabled.png new file mode 100755 index 0000000000000000000000000000000000000000..97ae9f375f2409fea9c2c406208f2421cbcf6b3d GIT binary patch literal 659 zcmV;E0&M+>P)Px#24YJ`L;%bH%mB>a!Cx8x000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ$ z3K2KY{T-430013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z0005% zNkl6vfZ3mM;EBND%{CD`>E^H(h!^fL*W@R76vlLPYU%n8rFPT1X6n zRu*buVIyK{Meb{!!RRV%x9{PF+uWJC^P4$ym=D7+2){T!@yp{4_}>HKuSp01eSLjV zCX=DTU_jTpVHnhIw<#KplGEuVmSstnWikwdbX_NgVTfTEnog&5+Y11NLLsVFt5%J!AO10Y$gl#rb?jv)QyAqEsp&o6TZ49HP}~VLToK02Ye{;_*0Qu^8s_`R$>h z>pIHiG89F5b}?4IVz5c<^?D&m5=Ntut(n{H#^G?la=C=x?}seQ002$XAc`VHQAEGr z{}#mO^ZiKCdxnQM7z_qsnx?JRY&Nmm?a*j6AP53_y&eEyv)Le#NFbR^V!d8l^Ld^} zDwTpHNyz8(--7TwZ{;fn=l$S*zlX=;vDL!iFbahN0ARIRA(zV`5{Y0knb6 zM1oqQy3p7nbymZlQMS>taxLB5DVp*0P4hOL;ONycp$8n^ps^v^oRf*#`n>z!6 t097iL2iLxG@jb)G`!9Y2z5)Mnz&{@rMe^cSSxo={002ovPDHLkV1htT7c&3= literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/color_text/alert_fired.png b/pandora_console/images/status_sets/color_text/alert_fired.png new file mode 100755 index 0000000000000000000000000000000000000000..48adca68df0d60e8e0b114fc9b69f7b7bde25416 GIT binary patch literal 433 zcmV;i0Z#sjP)Px#24YJ`L;(K)9RM9f-yjJ9000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ$ z3KAp!3Yshc0013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z00039 zNklCf1;aT(m6<%4tZS) z()2o6?87{5wb&sC?vQ(P;Bd|jgoIhJ$57aFWPw@Wf1~x?1@eCFEX*M9A0nfQDCGUB>iy%%1T6p$&ZXBYe-^U9 bEU+2x-}_yW@1G4C00000NkvXXu0mjfit4S= literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/color_text/alert_not_fired.png b/pandora_console/images/status_sets/color_text/alert_not_fired.png new file mode 100755 index 0000000000000000000000000000000000000000..6f130e23ad267e262d24ff3c12c3d5bafd52eeae GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!3HEX<>xE|QjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^sTR!g?m&kq2FWJ_ElN}Tg^ zb5rw57@Uhz6H8K46v{J8G895GQWe}ieFNU7sOAB!Q}%Rm4DmRg{N}Iz@A-)W%xZ0p zd~UK9uMQ}_KCnLjztNe3+M@x-KF&y7c3ZnG|NZ}iPrD@L58qUOUYB?y@c+bre0PHW zO>_*I+Pd)RT$APwF7CtEPVq}*`RV>R_2Jn$dA5GHx?k2GZcTg7)0bMqlM~~^!?(1C zC)~WweWLy5AKHhzwf9Tzxy{O^(G~wc`N8C*v;-h{Fg-2p$ERQNU4OpK>gU<^(}sCE z+fLUR5_Yz~Pagn+4k}@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ$ z3Joth=Gd740013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z0004# zNkl1uDmb6w#rCJO&AcElNte}5_tKjUQlaq_+APC|n{tZq-7AJLb zannsiT!i$8i}r_*+Stpv)LPq%NGHXdn4CitjHrGDZ+xOc?XUup0p_EJ(3QQIXNGX-MI>2_Nf+qyG zw#~h5lNX{DARUMEOoq)$rR#LkagdJFHSbiE|78#`XPV5KCYM2=%pCwY@_jBc8EnG< zU_X`m3L+(z-g`Gh`MbW)N-~LT&gV>1UE)U}m}n+FX=kiZbf}%Y%cgmr6Ve zK{*WBD3?D2G>u)$Vy{}I9ELpss{CEw=Qy2i_3m*xjqCerz#YpXYZy!yi%b=ZjCYhH zq3f&-4Y8%TC_jub{iN#tmGqD(Mt=9cg^#9^MU?1?01HJ>%*wl^Ryjjrz0000< KMNUMnLSTZHx%QU; literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/color_text/module_ok.png b/pandora_console/images/status_sets/color_text/module_ok.png new file mode 100755 index 0000000000000000000000000000000000000000..6f130e23ad267e262d24ff3c12c3d5bafd52eeae GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!3HEX<>xE|QjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^sTR!g?m&kq2FWJ_ElN}Tg^ zb5rw57@Uhz6H8K46v{J8G895GQWe}ieFNU7sOAB!Q}%Rm4DmRg{N}Iz@A-)W%xZ0p zd~UK9uMQ}_KCnLjztNe3+M@x-KF&y7c3ZnG|NZ}iPrD@L58qUOUYB?y@c+bre0PHW zO>_*I+Pd)RT$APwF7CtEPVq}*`RV>R_2Jn$dA5GHx?k2GZcTg7)0bMqlM~~^!?(1C zC)~WweWLy5AKHhzwf9Tzxy{O^(G~wc`N8C*v;-h{Fg-2p$ERQNU4OpK>gU<^(}sCE z+fLUR5_Yz~Pagn+4Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ$ z3Jw^lb}m%_0013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z0007r zNkl2xBi8Wqvz&PN42h>}J8FbD8P*MF8fI;URsre(!%|#A)I4rOfj$tVrLx_l` zFgsD0ouq9Vp|RN`Yb`Ima&v{*x$GLt_xr;fKlcm0Wf-$bGX61?dN zFy#s1=nhb}PfJ3A0)XEBAbWNuvU^7&z5PLXvT$2*w5;Re&EK+i?f#_vVX-QfUwdN$ zuP=lytq9|bHg*5c^)Gw7Tr5EKjy&Ex3yQ+ZG)KV)z7QB!50rpkc5&9|tz z5RhVsCgpIcjt5UXD+0#yTVHu;sLLSBs3JX0$=xfNQPcf3SEQv#;@QJ2k)TFAZZHZ{ zrc%r}^Mr6)g>YL%Nl}tK-oH081_U51IV$m~Gh5cChw{W`t6EG9Y!HB~ujVTyM95`X z)c4=}B$H9a#ymC6&!?$As^{s8849;)NY+JG<-_M$UUvuN%yo1H`1oZOfRM|=p#wU; z4@I{`pDc0qWC~aBO~zcoSiUhsiOU_5W3%iOmltb!*B9i%=~UkL2dOMwxV>Iln@k9| z72&qh+GN7s774l}DY#ynPJQDfQ=X7K=hQI+9bNtvw|S|5q)bQMoe5^VVa8p5Vgc&d zzE#7P`~-5dRaBHL0BrYBVAII=1vU-#_Gk{1k|fTYNa6CW30YIC71W(iUlDMrUw69TS%?G10avfTSdTRuCa3v&00000NkvXXu0mjflq6ue literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/color_text/server_down.png b/pandora_console/images/status_sets/color_text/server_down.png new file mode 100755 index 0000000000000000000000000000000000000000..4239af2438c31bdcd9688f870af045dc6ecf536a GIT binary patch literal 572 zcmV-C0>k}@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXJ$ z3Joth=Gd740013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z0004# zNkl1uDmb6w#rCJO&AcElNte}5_tKjUQlaq_+APC|n{tZq-7AJLb zannsiT!i$8i}r_*+Stpv)LPq%NGHXdn4CitjHrGDZ+xOc?XUup0p_EJ(3QQIXNGX-MI>2_Nf+qyG zw#~h5lNX{DARUMEOoq)$rR#LkagdJFHSbiE|78#`XPV5KCYM2=%pCwY@_jBc8EnG< zU_X`m3L+(z-g`Gh`MbW)N-~LT&gV>1UE)U}m}n+FX=kiZbf}%Y%cgmr6Ve zK{*WBD3?D2G>u)$Vy{}I9ELpss{CEw=Qy2i_3m*xjqCerz#YpXYZy!yi%b=ZjCYhH zq3f&-4Y8%TC_jub{iN#tmGqD(Mt=9cg^#9^MU?1?01HJ>%*wl^Ryjjrz0000< KMNUMnLSTZHx%QU; literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/color_text/server_ok.png b/pandora_console/images/status_sets/color_text/server_ok.png new file mode 100755 index 0000000000000000000000000000000000000000..6f130e23ad267e262d24ff3c12c3d5bafd52eeae GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!3HEX<>xE|QjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^sTR!g?m&kq2FWJ_ElN}Tg^ zb5rw57@Uhz6H8K46v{J8G895GQWe}ieFNU7sOAB!Q}%Rm4DmRg{N}Iz@A-)W%xZ0p zd~UK9uMQ}_KCnLjztNe3+M@x-KF&y7c3ZnG|NZ}iPrD@L58qUOUYB?y@c+bre0PHW zO>_*I+Pd)RT$APwF7CtEPVq}*`RV>R_2Jn$dA5GHx?k2GZcTg7)0bMqlM~~^!?(1C zC)~WweWLy5AKHhzwf9Tzxy{O^(G~wc`N8C*v;-h{Fg-2p$ERQNU4OpK>gU<^(}sCE z+fLUR5_Yz~Pagn+4!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szb%o<4+be-WvL&t&CC>S| zxv6<249-QVi6yBi3gww4844j8sS56%z5(x3RP%re)jVAsLp+Wr|IybzZ6MIlnb>e( n#nHuL{ZTeqAEAs7V$2NeYZ+tbsA!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szRn=Av#S);9Y>8_`iF1B# zZfaf$gL6@8Vo7R>LV0FMhC)b2s)DR|A6^>bP0l+XkKr+_<< literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/agent_no_data.png b/pandora_console/images/status_sets/default/agent_no_data.png new file mode 100755 index 0000000000000000000000000000000000000000..c68d728c51f3a102f4055b3a1d954d12699d0e78 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szO+gOLS!aPlvL&t&CC>S| zxv6<249-QVi6yBi3gww4844j8sS56%z5(x3RP%re)jVAsLp+WrPnr8=exd?{@L`6= nz;1V4xvdpf9zhuoblDhQOk=#{J-_V+PzQsjtDnm{r-UW|yP-RC literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/agent_no_monitors.png b/pandora_console/images/status_sets/default/agent_no_monitors.png new file mode 100755 index 0000000000000000000000000000000000000000..5ef86b9c094ea86e1039c53f29615cf489b0f692 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szb%BR#+phwJWJ_ElN}Tg^ zb5rw57@Uhz6H8K46v{J8G895GQWe}ieFNU7sOA9`s(HFNhIkxLwkdwbbJ&4Ft&Nds nu~>hUP1eU1N1==Z(L4-aE-`iZd@yDQ>R|A6^>bP0l+XkKAw)Z^ literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/agent_ok.png b/pandora_console/images/status_sets/default/agent_ok.png new file mode 100755 index 0000000000000000000000000000000000000000..2f8624c0aa760a445644bd3bfef3c29c97d3c176 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szP4+*3_2&SEWJ_ElN}Tg^ zb5rw57@Uhz6H8K46v{J8G895GQWe}ieFNU7sOA9`s(HFNhIkxLe)CuVw1GfFXJW&F n6-O6~^+(xceS|VTh%qzl&tN>eTVSRnPzQsjtDnm{r-UW|et!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szbuIOUap^!I*%H@?66gHf z+|;}h2Ir#G#FEq$h4Rdj426)4R0VfW-+=cis(C<#YMw5RAs)w*|NM8FnW(@Ze3+pz nu-jc%ZfnJrM^MHCT{eavjZAudA5A@hIv6}%{an^LB{Ts5xWYP~ literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/alert_disabled.png b/pandora_console/images/status_sets/default/alert_disabled.png new file mode 100755 index 0000000000000000000000000000000000000000..ead1ffd337a11e0f385434b41a1fed8b375cd317 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W^!2~4tE}kt9q!^2X+?^QKos)S9wc6hbmm72G|21Ky{o<^dJTdAc};Xq->}qpy9Mf%(6rgoLCA jgAb2LL*Q9wH)Dp=5lr5f4@?vUs$}qV^>bP0l+XkKWh*p5 literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/alert_not_fired.png b/pandora_console/images/status_sets/default/alert_not_fired.png new file mode 100755 index 0000000000000000000000000000000000000000..d8c3ca37e7ffeb022b3d35e111f85ee11f6c3601 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W^!2~4tE}kt9q!^2X+?^QKos)S9)U=jq}YqH#X?&0qb~4DA0UB_t#} j*nN0J8UoKcyBRa=bYtDnm{r-UW|_kcFh literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/module_critical.png b/pandora_console/images/status_sets/default/module_critical.png new file mode 100755 index 0000000000000000000000000000000000000000..84356a404c06c7733902788db0b87e213f5dd516 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szb%o<4+be-WvL&t&CC>S| zxv6<249-QVi6yBi3gww4844j8sS56%z5(x3RP%re)jVAsLp+Wr|IybzZ6MIlnb>e( n#nHuL{ZTeqAEAs7V$2NeYZ+tbsA!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szb<4%_@;iY-vL&t&CC>S| zxv6<249-QVi6yBi3gww4844j8sS56%z5(x3RP%re)jVAsLp+Wrzxk_w+CZS8GqK^o nild9g`lD>JK0+BE#F!cOXE2`KEih9OsDr`N)z4*}Q$iB}7S}wW literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/module_warning.png b/pandora_console/images/status_sets/default/module_warning.png new file mode 100755 index 0000000000000000000000000000000000000000..af5c3ab87ab3c3affe44228e12a6a86f2708cd1f GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^8bB<>!2~3i)pCCXQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO%^szbuIOUap^!I*%H@?66gHf z+|;}h2Ir#G#FEq$h4Rdj426)4R0VfW-+=cis(C<#YMw5RAs)w*|NM8FnW(@Ze3+pz nu-jc%ZfnJrM^MHCT{eavjZAudA5A@hIv6}%{an^LB{Ts5xWYP~ literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/server_down.png b/pandora_console/images/status_sets/default/server_down.png new file mode 100755 index 0000000000000000000000000000000000000000..18422d3fa0ef3ec306ccc3a55812df4c7b5ace0a GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1SFYWcSQjy#^NA%Cx&(BWL^R}Y)RhkE)4%c zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPy3md0~P>1y|GoX-ciEBiObAE1a zYF-J0b5UwyNotBhd1gt5LP$ocg1e`0!21-{JfK2DPZ!4!i_^(}^tDejF#ng7kdX9X z@Zk|@XuN#pll;{G^Ht9Ftgv!-YUs_9yK2*6%FMuL%9`RAF?~BwGlQqApUXO@geCz0 C#yvy; literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/default/server_ok.png b/pandora_console/images/status_sets/default/server_ok.png new file mode 100755 index 0000000000000000000000000000000000000000..316e6dd1eff68ab1c98a77fbf9ef056543bd387d GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1SFYWcSQjy#^NA%Cx&(BWL^R}Y)RhkE)4%c zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmPy3md0~sji`aEKo?c#5JPCIX^cy zHLrxhxhOTUBsE2$JhLQ2AtWPJ!QIn0;C+f}9#Em7r;B5V#p&cXfAvo@u>Y5okdW+P z_u&y~XuN#p&V!dKgf1n7cnZeW5&t;ucLK6VW C_&rwu literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/faces/agent_critical.png b/pandora_console/images/status_sets/faces/agent_critical.png new file mode 100755 index 0000000000000000000000000000000000000000..caa87af4763385398b1e112872fa8d4a9d357637 GIT binary patch literal 1202 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 literal 0 HcmV?d00001 diff --git a/pandora_console/images/status_sets/faces/agent_ok.png b/pandora_console/images/status_sets/faces/agent_ok.png new file mode 100755 index 0000000000000000000000000000000000000000..3b7c0b6e642d5e91d6f72a707aedb2e4d4e93e21 GIT binary patch literal 1232 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 0) { - $options["src"] = "images/pixel_red.png"; - $options["title"] = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); + $status = STATUS_ALERT_FIRED; + $title = __('Alert fired').' '.$alert["times_fired"].' '.__('times'); } elseif ($alert["disabled"] > 0) { - $options["src"] = "images/pixel_gray.png"; - $options["title"] = __('Alert disabled'); + $status = STATUS_ALERT_DISABLED; + $title = __('Alert disabled'); } else { - $options["src"] = "images/pixel_green.png"; - $options["title"] = __('Alert not fired'); + $status = STATUS_ALERT_NOT_FIRED; + $title = __('Alert not fired'); } - $data[4] = print_image ($options["src"], true, $options); + $data[4] = print_status_image($status, $title, true); + if ($compound) { $data[5] = print_checkbox ("validate_compound[]", $alert["id"], false, true); @@ -1011,4 +1012,56 @@ function format_filesize ($bytes) { return format_numeric ($bytes / pow ($con, $log), 1).' '.$strs[$log]; } + + +/** + * Returns the current path to the selected image set to show the + * status of agents and alerts. + * + * @return array An array with the image path, image width and image height. + */ +function get_status_images_path() +{ + global $config; + + $imageset = $config["status_images_set"]; + + if (strpos($imageset, ",") === false) $imageset .= ",40x18"; + list($imageset, $sizes) = split(",", $imageset, 2); + + if (strpos($sizes, "x") === false) $sizes .= "x18"; + list($imagewidth, $imageheight) = split("x", $sizes, 2); // 40x18 + + $imagespath = "images/status_sets/$imageset"; + + return array($imagespath); +} + +define('STATUS_MODULE_OK', 'module_ok.png'); +define('STATUS_MODULE_CRITICAL', 'module_critical.png'); +define('STATUS_MODULE_WARNING', 'module_warning.png'); + +define('STATUS_AGENT_CRITICAL', 'agent_critical.png'); +define('STATUS_AGENT_WARNING', 'agent_warning.png'); +define('STATUS_AGENT_DOWN', 'agent_down.png'); +define('STATUS_AGENT_OK', 'agent_ok.png'); +define('STATUS_AGENT_NO_DATA', 'agent_no_data.png'); +define('STATUS_AGENT_NO_MONITORS', 'agent_no_monitors.png'); + +define('STATUS_ALERT_FIRED', 'alert_fired.png'); +define('STATUS_ALERT_NOT_FIRED', 'alert_not_fired.png'); +define('STATUS_ALERT_DISABLED', 'alert_disabled.png'); + +define('STATUS_SERVER_OK', 'server_ok.png'); +define('STATUS_SERVER_DOWN', 'server_down.png'); + +function print_status_image($type, $title = "", $return = false) +{ + list($imagepath) = get_status_images_path(); + + $imagepath .= "/" . $type; + + return print_image ($imagepath, $return, array ("border" => 0, "title" => $title)); +} + ?> diff --git a/pandora_console/operation/agentes/bulbs.php b/pandora_console/operation/agentes/bulbs.php index 0046bf4a25..68ecf7b69d 100644 --- a/pandora_console/operation/agentes/bulbs.php +++ b/pandora_console/operation/agentes/bulbs.php @@ -16,25 +16,24 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - echo " - - - - - - - - + + + + + + + + + + + + + + + +
- ".__('All Monitors OK')." - ".__('At least one monitor fails')." - ".__('Change between Green/Red state')." - ".__('Alert fired')."
- ".__('Agent without monitors')." - ".__('Agent without data')." - ".__('Agent down')." - ".__('Alert not fired')."
" . print_status_image(STATUS_AGENT_OK, __('All Monitors OK'), true) . __('All Monitors OK') . "" . print_status_image(STATUS_MODULE_CRITICAL, __('At least one monitor fails'), true) . __('At least one monitor fails') . "" . print_status_image(STATUS_MODULE_WARNING, __('Change between Green/Red state'), true) . __('Change between Green/Red state') . "" . print_status_image(STATUS_ALERT_FIRED, __('Alert fired'), true) . __('Alert fired') . "" . print_status_image(STATUS_ALERT_DISABLED, __('Alert disabled'), true) . __('Alerts disabled') . "
" . print_status_image(STATUS_AGENT_NO_MONITORS, __('Agent without monitors'), true) . __('Agent without monitors') . "" . print_status_image(STATUS_AGENT_NO_DATA, __('Agent without data'), true) . __('Agent without data') . "" . print_status_image(STATUS_AGENT_DOWN, __('Agent down'), true) . __('Agent down') . "" . print_status_image(STATUS_ALERT_NOT_FIRED, __('Alert not fired'), true) . __('Alert not fired') . "
"; diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index b06696bb14..a1a6ef1629 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -304,31 +304,32 @@ if ($agents !== false) { if ($monitor_down > 0) echo " : ".$monitor_down.""; echo ""; - + + echo ""; if ($numero_modulos > 0){ if ($agent_down > 0) { - echo ''; + print_status_image(STATUS_AGENT_DOWN, __('Agent down')); } elseif ($monitor_critical > 0) { - echo ''; + print_status_image(STATUS_AGENT_CRITICAL, __('At least one module in CRITICAL status')); } elseif ($monitor_warning > 0) { - echo ''; + print_status_image(STATUS_AGENT_WARNING, __('At least one module in WARNING status')); } else { - echo ''; + print_status_image(STATUS_AGENT_OK, __('All Monitors OK')); } } else { - echo ''; + print_status_image(STATUS_AGENT_NO_DATA, __('Agent without data')); } // checks if an alert was fired recently echo ""; if (give_disabled_group ($id_grupo)) { - echo ""; + print_status_image(STATUS_ALERT_DISABLED, __('Alert disabled')); } else { if (check_alert_fired ($id_agente) == 1) - echo ''; + print_status_image(STATUS_ALERT_FIRED, __('Alert fired')); else - echo ''; + print_status_image(STATUS_ALERT_NOT_FIRED, __('Alert not fired')); } echo ""; echo ""; diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 9bf0fcb63c..e5c8f328be 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -54,6 +54,8 @@ $table->head[4] = __('Status'); $table->head[5] = __('Interval'); $table->head[6] = __('Last contact'); +$table->align = array("left","left","left","left","center"); + foreach ($modules as $module) { $data = array (); if (($module["id_modulo"] != 1) && ($module["id_tipo_modulo"] != 100)) { @@ -72,20 +74,31 @@ foreach ($modules as $module) { $data[2] = substr ($module["nombre"], 0, 25); $data[3] = substr ($module["descripcion"], 0, 35); - + + + $status = STATUS_MODULE_WARNING; + $title = ""; + if ($module["estado"] == 2) { - $data[4] = ''; + $title .= " : " . format_for_graph($module["datos"]); } else { - $data[4] .= substr(salida_limpia($module["datos"]),0,42) . '">'; + $title .= " : " . substr(salida_limpia($module["datos"]),0,42); } + + $data[4] = print_status_image($status, $title, true); + + if ($module["module_interval"] > 0) { $data[5] = $module["module_interval"]; diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index b812b0c636..f2de50de1d 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -233,11 +233,11 @@ foreach ($result as $row) { $data[4] = $row["agent_interval"]; if ($row["estado"] == 0) { - $data[5] = ''; + $data[5] = print_status_image(STATUS_MODULE_OK, $row["datos"], true); } elseif ($row["estado"] == 1) { - $data[5] = ''; + $data[5] = print_status_image(STATUS_MODULE_CRITICAL, $row["datos"], true); } else { - $data[5] = ''; + $data[5] = print_status_image(STATUS_MODULE_WARNING, $row["datos"], true); } $seconds = get_system_time () - $row["utimestamp"]; diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index bd4fb32694..77a130e323 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -185,9 +185,9 @@ foreach ($serverinfo as $server) { $data[0] = $server["name"]; if ($server["status"] == 0){ - $data[1] = print_image ("images/pixel_red.png", true, array ("width" => 20, "height" => 20)); + $data[1] = print_status_image(STATUS_SERVER_DOWN, '', true); } else { - $data[1] = print_image ("images/pixel_green.png", true, array ("width" => 20, "height" => 20)); + $data[1] = print_status_image(STATUS_SERVER_OK, '', true); } $data[2] = print_image ("reporting/fgraph.php?tipo=progress&percent=".$server["load"]."&height=20&width=80", diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php index 09b700a175..82ae5fd866 100644 --- a/pandora_console/operation/servers/view_server.php +++ b/pandora_console/operation/servers/view_server.php @@ -65,9 +65,9 @@ foreach ($servers as $server) { $data[0] = "".$server['name'].""; if ($server['status'] == 0) { - $data[1] = print_image ("images/pixel_red.png", true, array ("width" => 10, "height" => 10)); + $data[1] = print_status_image(STATUS_SERVER_DOWN, '', true); } else { - $data[1] = print_image ("images/pixel_green.png", true, array ("width" => 10, "height" => 10)); + $data[1] = print_status_image(STATUS_SERVER_OK, '', true); } // Load diff --git a/pandora_console/reporting/fgraph.php b/pandora_console/reporting/fgraph.php index c4235e189f..1adefd4cd9 100644 --- a/pandora_console/reporting/fgraph.php +++ b/pandora_console/reporting/fgraph.php @@ -429,6 +429,11 @@ function graphic_agentmodules ($id_agent, $width, $height) { function graphic_agentaccess ($id_agent, $width, $height, $period = 0) { global $config; + + /* BROKEN: Need to fix, it gets 100% CPU of Apache !!!*/ + + $data = array(); +/* $resolution = $config["graph_res"] * ($period * 2 / $width); // Number of "slices" we want in graph @@ -450,9 +455,15 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0) { "utimestamp < $date"), array ('utimestamp')); + if ($result === false) $result = array (); + +// SEEMS that problem is below +// it get's 100% cpu on apache and problem is localed here, I don't exactly +// why or what is happening here, but i'm sure that the problem is here. + $max_value = 0; foreach ($result as $access) { $utimestamp = $access['utimestamp']; @@ -463,7 +474,7 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0) { } } } - + */ $engine = get_graph_engine ($period); $engine->width = $width;