ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-6419. Nagios UI on Ubuntu is broken not showing any dynamic contents (aonishuk)
Date Tue, 08 Jul 2014 15:12:18 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 09aef90eb -> dc43984ca


AMBARI-6419. Nagios UI on Ubuntu is broken not showing any dynamic contents (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dc43984c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dc43984c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dc43984c

Branch: refs/heads/trunk
Commit: dc43984ca0320864ddf3d5085bf1ced4c7f70d4e
Parents: 09aef90
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Jul 8 18:12:03 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Jul 8 18:12:03 2014 +0300

----------------------------------------------------------------------
 .../stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py | 5 +++++
 .../HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2 | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/dc43984c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
index 3be204b..42ccb35 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
@@ -49,6 +49,8 @@ if System.get_instance().os_family == "debian":
     format("{conf_dir}/conf.d/generic-service_nagios2.cfg"),
     format("{conf_dir}/conf.d/timeperiods_nagios2.cfg"),
   ]
+  cgi_dir = "/usr/lib/cgi-bin/nagios3"
+  cgi_weblink = "/cgi-bin/nagios3"
 else:
   host_template = "linux-server"
   plugins_dir = "/usr/lib64/nagios/plugins"
@@ -61,6 +63,9 @@ else:
     format("{nagios_obj_dir}/templates.cfg"),
   ]
   
+  cgi_dir = "/usr/lib/nagios/cgi"
+  cgi_weblink = "/nagios/cgi-bin"
+  
 check_result_path = "/var/nagios/spool/checkresults"
 nagios_log_dir = "/var/log/nagios"
 nagios_log_archives_dir = format("{nagios_log_dir}/archives")

http://git-wip-us.apache.org/repos/asf/ambari/blob/dc43984c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2
index f8420d2..c7658c1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/nagios.conf.j2
@@ -44,9 +44,9 @@
 # needed to fit your system.
 #
 
-ScriptAlias /nagios/cgi-bin "/usr/lib/nagios/cgi"
+ScriptAlias {{cgi_weblink}} "{{cgi_dir}}"
 
-<Directory "/usr/lib/nagios/cgi">
+<Directory "{{cgi_dir}}">
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
@@ -61,7 +61,7 @@ ScriptAlias /nagios/cgi-bin "/usr/lib/nagios/cgi"
    Require valid-user
 </Directory>
 
-Alias /nagios "{{nagios_web_dir}}"
+Alias /{{nagios_service_name}} "{{nagios_web_dir}}"
 
 <Directory "{{nagios_web_dir}}">
 #  SSLRequireSSL


Mime
View raw message