This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new fb242ab [AMBARI-23868] Log Search web alert gets 401 http status code
if KNOX SSO is enabled. (#1294)
fb242ab is described below
commit fb242abe846f970fd5f086348d823c793e9b1e84
Author: Olivér Szabó <[email protected]>
AuthorDate: Thu May 17 02:15:12 2018 +0200
[AMBARI-23868] Log Search web alert gets 401 http status code if KNOX SSO
is enabled. (#1294)
* AMBARI-23868. Log Search web alert gets 401 http status code if KNOX SSO
is enabled.
* AMBARI-23868. Update service check url as well.
---
.../src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json | 4 ++--
.../common-services/LOGSEARCH/0.5.0/package/scripts/params.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json
index 4cb2651..df9e7d9 100644
---
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json
+++
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/alerts.json
@@ -10,8 +10,8 @@
"source": {
"type": "WEB",
"uri": {
- "http": "{{logsearch-properties/logsearch.http.port}}",
- "https": "{{logsearch-properties/logsearch.https.port}}",
+ "http":
"{{logsearch-properties/logsearch.protocol}}://0.0.0.0:{{logsearch-properties/logsearch.http.port}}/api/v1/info",
+ "https":
"{{logsearch-properties/logsearch.protocol}}://0.0.0.0:{{logsearch-properties/logsearch.https.port}}/api/v1/info",
"https_property": "{{logsearch-properties/logsearch.protocol}}",
"https_property_value": "https",
"default_port": 61888,
diff --git
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
index 5cd16a7..ef5d9dd 100644
---
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/params.py
@@ -415,4 +415,4 @@ logsearch_server_host = ""
logsearch_ui_port = logsearch_https_port if logsearch_protocol == 'https'
else logsearch_http_port
if logsearch_server_hosts is not None and len(logsearch_server_hosts) > 0:
logsearch_server_host = logsearch_server_hosts[0]
-smoke_logsearch_cmd = format('curl -k -s -o /dev/null -w "%{{http_code}}"
{logsearch_protocol}://{logsearch_server_host}:{logsearch_ui_port}/ | grep 200')
+smoke_logsearch_cmd = format('curl -k -s -o /dev/null -w "%{{http_code}}"
{logsearch_protocol}://{logsearch_server_host}:{logsearch_ui_port}/api/v1/info
| grep 200')
--
To stop receiving notification emails like this one, please contact
[email protected].
