Author: Lars Michelsen <[email protected]>
Date: Tue Jul 5 19:08:47 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Jul 5 19:08:47 2011 +0200
Removed WUI notes from doc; Misc cleanups to remove old WUI fragments
---
TODO | 2 ++
docs/en_US/installation_instructions.html | 20 ++++++--------------
docs/en_US/user_interface.html | 7 -------
install.sh | 4 ++++
omd_install.sh | 9 ++-------
share/server/core/classes/GlobalMainCfg.php | 3 +++
6 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/TODO b/TODO
index 5d45f59..3b77136 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,7 @@ This is a small file for storing quick thoughts about new
features and needed ch
===============================================================================
- Doku Link im Header darf nur auf Sprachen zeigen, die auch existieren
+- GröÃe der Controls soll konfigurierbar sein. Dazu reicht eine Option in
der Hauptkonfiguration
- Backends:
- Zusätzlich beliebige Variablen vom Backend holen lassen
@@ -12,6 +13,7 @@ This is a small file for storing quick thoughts about new
features and needed ch
Installer:
- Der Installer muss beim Update darauf achten, dass die alten [paths]
Variablen aus
der nagvis.ini.php entfernt werden.
+ - Der Installer muss beim Update autoupdatefreq, headermenu, headertemplate
aus [wui] Sektion entfernen
Neue Idee:
- Map Aufbau gliedert sich in 2 Phasen
diff --git a/docs/en_US/installation_instructions.html
b/docs/en_US/installation_instructions.html
index e371403..c4e6661 100644
--- a/docs/en_US/installation_instructions.html
+++ b/docs/en_US/installation_instructions.html
@@ -86,20 +86,12 @@ chmod 664 /usr/local/nagvis/var/tmpl/cache/*</pre>
It's possible to set even lower permissions on the files but for most
setups the example should be fine.
Only change them if you know what you are doing!
- <h2> STEP 7: The graphical config tool (WUI) </h2>
- NagVis has an included web based config tool called WUI. If you want
to use it use your browser to open the page:
-
<pre>http://<nagiosserver>/<path-to-nagvis>/frontend/wui/index.php</pre>
- (i.e. http://localhost/nagvis/frontend/index.php).<br>
- Hint: If you have some script or popup blockers, disable them for the
WUI.<p>
-
- When you see the NagVis image, right click on it, then a context menu
should open and now you can configure NagVis and create maps with the WUI.<p>
-
- <img src="../general/img/medium_nagvis-1.0-wui-preview.png"
title="Just open the URL to the Config Tool in a Browser and use your right
mouse button">
-
- <p><font style="color:red">The Config Tool DOES NOT display the
current Nagios states of objects configured. It's only for configuring! To
"use" your configured maps afterwards see STEP 8!</font></p>
-
- If this doesn't work for you or if you don't want to use the WUI, you
can simply edit the map config files in the <code>etc/maps/</code> directory
with your favourite text editor.
- For valid formats and values have a look at <a
href="map_config_format_description.html">Map Config Format Description</a>.
+ <h2> STEP 7: Configure the maps </h2>
+ <p>There are two ways configuring NagVis. First is the web based
configuration using the regular frontend. Take a look
+ at the header menu for options. To modify existing map objects you need
to unlock the object you like to edit.</p>
+
+ <p>The secod way is to edit the configuration files directly using a
text editor of your choice. The map config files are located in
<code>etc/maps/</code>.
+ For valid formats and values have a look at <a
href="map_config_format_description.html">Map Config Format Description</a>.</p>
<h2> STEP 8: View the maps </h2>
You should now be able to view your defined maps in your browser:
diff --git a/docs/en_US/user_interface.html b/docs/en_US/user_interface.html
index b58a289..edf2595 100644
--- a/docs/en_US/user_interface.html
+++ b/docs/en_US/user_interface.html
@@ -46,13 +46,6 @@
<tr>
<td>nagvis/frontend/nagvis-js/index.php?mod=Rotation&show=<name></td><td>This
is the map rotation mode. In this mode you call a rotation (<a
href=nagvis_config_format_description.html#rotation>rotation</a> has to be
defined in main configuration file). The rotation switches different views
after a configured timeperiod.</td>
</tr>
- <tr><th colspan="2"> WUI (NagVis configuration)</th></tr>
- <tr>
- <td>config.php</td><td>This is a redirection to wui/index.php
(configuration interface)</td>
- </tr>
- <tr>
- <td>wui/index.php</td><td>This is the Welcome page of the NagVis
configuration interface (WUI). Right click on the background image to open the
WUI menu.</td>
- </tr>
</body>
</table>
</html>
diff --git a/install.sh b/install.sh
index 33978ac..2fecf2c 100755
--- a/install.sh
+++ b/install.sh
@@ -1586,6 +1586,10 @@ if [ "$INSTALLER_ACTION" = "update" -a "$NAGVIS_VER_OLD"
!= "UNKNOWN" -a "$INSTA
sed -i '/^allowedforconfig=/d' $NAGVIS_PATH/etc/nagvis.ini.php
chk_rc "| Error" "$DONE"
+ DONE=`log "Removing autoupdatefreq option from main config..."
done`
+ sed -i '/^autoupdatefreq=/d' $NAGVIS_PATH/etc/nagvis.ini.php
+ chk_rc "| Error" "$DONE"
+
# Remove base and htmlbase path from cross path updated main
# configuration file
if [ "$NAGVIS_PATH_OLD" != "$NAGVIS_PATH" ]; then
diff --git a/omd_install.sh b/omd_install.sh
index 3b269d3..046293b 100755
--- a/omd_install.sh
+++ b/omd_install.sh
@@ -141,18 +141,13 @@ Alias /$OMD_SITE/nagvis
"$OMD_ROOT/local/share/nagvis/htdocs"
RewriteCond %{REQUEST_URI} ^/$OMD_SITE/nagvis(/index\.php|/|)(\?.*|)$
RewriteRule ^(index\.php|)(\?.*|)$
/$OMD_SITE/nagvis/frontend/nagvis-js/$1$2 [R=301,L]
RewriteCond %{REQUEST_URI} ^/$OMD_SITE/nagvis/config\.php.*$
- RewriteRule ^config\.php(.*) /$OMD_SITE/nagvis/frontend/wui/$1 [R=301,L]
+ RewriteRule ^config\.php(.*)(\?.*|)$
/$OMD_SITE/nagvis/frontend/nagvis-js/$1$2 [R=301,L]
# Redirect old regular map links
- RewriteCond %{REQUEST_URI} ^/$OMD_SITE/nagvis/frontend/nagvis-js
+ RewriteCond %{REQUEST_URI} ^/$OMD_SITE/nagvis/frontend/(nagvis-js|wui)
RewriteCond %{QUERY_STRING} map=(.*)
RewriteRule ^(.*)$
/$OMD_SITE/nagvis/frontend/nagvis-js/index.php?mod=Map&act=view&show=%1
[R=301,L]
- # Redirect old wui map links
- RewriteCond %{REQUEST_URI} ^/$OMD_SITE/nagvis/frontend/wui
- RewriteCond %{QUERY_STRING} map=(.*)
- RewriteRule ^(.*)$
/$OMD_SITE/nagvis/frontend/wui/index.php?mod=Map&act=edit&show=%1 [R=301,L]
-
# Redirect old rotation calls
RewriteCond %{REQUEST_URI} ^/$OMD_SITE/nagvis/frontend/nagvis-js
RewriteCond %{QUERY_STRING} !mod
diff --git a/share/server/core/classes/GlobalMainCfg.php
b/share/server/core/classes/GlobalMainCfg.php
index adb5aa3..67c4368 100644
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
@@ -349,16 +349,19 @@ class GlobalMainCfg {
'autoupdatefreq' => Array('must' => 0,
'editable' => 1,
'default' => '25',
+ 'deprecated' => 1,
'field_type' => 'dropdown',
'match' => MATCH_INTEGER),
'headermenu' => Array('must' => 1,
'editable' => 1,
+ 'deprecated' => 1,
'default' => '1',
'field_type' => 'boolean',
'match' => MATCH_BOOLEAN),
'headertemplate' => Array('must' => 0,
'editable' => 1,
'default' => 'default',
+ 'deprecated' => 1,
'depends_on' => 'headermenu',
'depends_value' => 1,
'field_type' => 'dropdown',
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
