You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mr...@apache.org on 2017/09/11 04:39:04 UTC
[34/94] [abbrv] [partial] ambari git commit: AMBARI-21870. Integrate
LogSearch new UI with the server and get rid of the old one (oleewere)
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json b/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
new file mode 100644
index 0000000..84c4abc
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
@@ -0,0 +1,124 @@
+{
+ "common.title": "Log Search",
+
+ "modal.submit": "OK",
+ "modal.cancel": "Cancel",
+
+ "authorization.name": "Username",
+ "authorization.password": "Password",
+ "authorization.signIn": "Sign In",
+ "authorization.error": "<strong>Error!</strong> Invalid User credentials.<br>Please try again.",
+
+ "topMenu.undo": "Undo",
+ "topMenu.redo": "Redo",
+ "topMenu.refresh": "Refresh",
+ "topMenu.history": "History",
+
+ "filter.all": "All",
+
+ "filter.clusters": "Clusters",
+ "filter.message": "Message:",
+ "filter.components": "Components",
+ "filter.levels": "Levels",
+ "filter.capture": "Capture",
+ "filter.excluded": "Excluded",
+ "filter.hosts": "Hosts",
+
+ "filter.timeRange.1hr": "Last 1 hour",
+ "filter.timeRange.24hr": "Last 24 hours",
+ "filter.timeRange.today": "Today",
+ "filter.timeRange.yesterday": "Yesterday",
+ "filter.timeRange.7d": "Last 7 days",
+ "filter.timeRange.30d": "Last 30 days",
+ "filter.timeRange.thisMonth": "This month",
+ "filter.timeRange.lastMonth": "Last month",
+ "filter.timeRange.custom": "Custom range",
+
+ "levels.fatal": "Fatal",
+ "levels.error": "Error",
+ "levels.warn": "Warn",
+ "levels.info": "Info",
+ "levels.debug": "Debug",
+ "levels.trace": "Trace",
+ "levels.unknown": "Unknown",
+
+ "sorting.title": "Sort By",
+ "sorting.level.asc": "Ascending Level",
+ "sorting.level.desc": "Descending Level",
+ "sorting.component.asc": "Ascending Component",
+ "sorting.component.desc": "Descending Component",
+ "sorting.time.asc": "Ascending Time",
+ "sorting.time.desc": "Descending Time",
+
+ "pagination.title": "Rows per page:",
+ "pagination.numbers": "{{startIndex}}-{{endIndex}} of {{totalCount}}",
+
+ "logs.columns": "Columns",
+ "logs.status": "Status",
+ "logs.details": "Details",
+ "logs.message": "Message",
+ "logs.bundleId": "Bundle Id",
+ "logs.caseId": "Case Id",
+ "logs.cluster": "Cluster",
+ "logs.eventCount": "Event Count",
+ "logs.file": "File",
+ "logs.host": "Host",
+ "logs.id": "Id",
+ "logs.ip": "Ip",
+ "logs.level": "Level",
+ "logs.lineNumber": "Line Number",
+ "logs.logType": "Log Type",
+ "logs.logfileLineNumber": "Logfile Line Number",
+ "logs.loggerName": "Logger Name",
+ "logs.method": "Method",
+ "logs.path": "Path",
+ "logs.rowType": "Row Type",
+ "logs.threadName": "Thread",
+ "logs.type": "Type",
+ "logs.enforcer": "Access Enforcer",
+ "logs.accessType": "Access Type",
+ "logs.action": "Action",
+ "logs.agent": "Agent",
+ "logs.agentHost": "Agent Host",
+ "logs.authType": "Auth Type",
+ "logs.clientIp": "Client Ip",
+ "logs.clientType": "Client Type",
+ "logs.dst": "DST",
+ "logs.eventTime": "Event Time",
+ "logs.logMessage": "Log Message",
+ "logs.logTime": "Log Time",
+ "logs.perm": "Perm",
+ "logs.policy": "Policy",
+ "logs.proxyUsers": "Proxy Users",
+ "logs.reason": "Reason",
+ "logs.repo": "Repo",
+ "logs.repoType": "Repo Type",
+ "logs.reqCallerId": "Req Caller Id",
+ "logs.reqContext": "Req Context",
+ "logs.reqData": "Req Data",
+ "logs.reqSelfId": "Req Self Id",
+ "logs.resType": "Res Type",
+ "logs.resource": "Resource",
+ "logs.result": "Result",
+ "logs.session": "Session",
+ "logs.text": "Text",
+ "logs.ugi": "UGI",
+ "logs.user": "User",
+ "logs.baseUrl": "Base URL",
+ "logs.command": "Command",
+ "logs.component": "Component",
+ "logs.details": "Details",
+ "logs.displayName": "Display Name",
+ "logs.os": "OS",
+ "logs.repoId": "Repo Id",
+ "logs.repoVersion": "Repo Version",
+ "logs.repositories": "Repositories",
+ "logs.requestId": "Request Id",
+ "logs.resultStatus": "Result Status",
+ "logs.roles": "Roles",
+ "logs.stackVersion": "Stack Version",
+ "logs.stack": "Stack",
+ "logs.taskId": "Task Id",
+ "logs.versionNote": "Version Note",
+ "logs.versionNumber": "Version Number"
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/environments/environment.prod.ts
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/environments/environment.prod.ts b/ambari-logsearch/ambari-logsearch-web/src/environments/environment.prod.ts
new file mode 100644
index 0000000..690ddb1
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-web/src/environments/environment.prod.ts
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const environment = {
+ production: true
+};
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/environments/environment.ts
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/environments/environment.ts b/ambari-logsearch/ambari-logsearch-web/src/environments/environment.ts
new file mode 100644
index 0000000..e34c67c
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-web/src/environments/environment.ts
@@ -0,0 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const environment = {
+ production: false
+};
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/favicon.ico
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/favicon.ico b/ambari-logsearch/ambari-logsearch-web/src/favicon.ico
new file mode 100644
index 0000000..62604cb
Binary files /dev/null and b/ambari-logsearch/ambari-logsearch-web/src/favicon.ico differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/index.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/index.html b/ambari-logsearch/ambari-logsearch-web/src/index.html
new file mode 100644
index 0000000..f1c1562
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-web/src/index.html
@@ -0,0 +1,31 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!doctype html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>LogSearch</title>
+ <base href="/">
+
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+ <app-root>Loading...</app-root>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main.ts
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/main.ts b/ambari-logsearch/ambari-logsearch-web/src/main.ts
new file mode 100644
index 0000000..5e76e0d
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-web/src/main.ts
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {enableProdMode} from '@angular/core';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+
+import {AppModule} from '@app/app.module';
+import {environment} from '@envs/environment';
+
+if (environment.production) {
+ enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule);
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/404.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/404.html b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/404.html
deleted file mode 100644
index 76ac201..0000000
--- a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/404.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE html>
-<html lang="en">
- <head>
-
- <meta charset="utf-8">
- <title>Page Not Found :(</title>
- <style>
- ::-moz-selection {
- background: #b3d4fc;
- text-shadow: none;
- }
-
- ::selection {
- background: #b3d4fc;
- text-shadow: none;
- }
-
- html {
- padding: 30px 10px;
- font-size: 20px;
- line-height: 1.4;
- color: #737373;
- background: #f0f0f0;
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
- }
-
- html,
- input {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- }
-
- body {
- max-width: 500px;
- _width: 500px;
- padding: 30px 20px 50px;
- border: 1px solid #b3b3b3;
- border-radius: 4px;
- margin: 0 auto;
- box-shadow: 0 1px 10px #a7a7a7, inset 0 1px 0 #fff;
- background: #fcfcfc;
- }
-
- h1 {
- margin: 0 10px;
- font-size: 50px;
- text-align: center;
- }
-
- h1 span {
- color: #bbb;
- }
-
- h3 {
- margin: 1.5em 0 0.5em;
- }
-
- p {
- margin: 1em 0;
- }
-
- ul {
- padding: 0 0 0 40px;
- margin: 1em 0;
- }
-
- .container {
- max-width: 380px;
- _width: 380px;
- margin: 0 auto;
- }
-
- /* google search */
-
- #goog-fixurl ul {
- list-style: none;
- padding: 0;
- margin: 0;
- }
-
- #goog-fixurl form {
- margin: 0;
- }
-
- #goog-wm-qt,
- #goog-wm-sb {
- border: 1px solid #bbb;
- font-size: 16px;
- line-height: normal;
- vertical-align: top;
- color: #444;
- border-radius: 2px;
- }
-
- #goog-wm-qt {
- width: 220px;
- height: 20px;
- padding: 5px;
- margin: 5px 10px 0 0;
- box-shadow: inset 0 1px 1px #ccc;
- }
-
- #goog-wm-sb {
- display: inline-block;
- height: 32px;
- padding: 0 10px;
- margin: 5px 0 0;
- white-space: nowrap;
- cursor: pointer;
- background-color: #f5f5f5;
- background-image: -webkit-linear-gradient(rgba(255,255,255,0), #f1f1f1);
- background-image: -moz-linear-gradient(rgba(255,255,255,0), #f1f1f1);
- background-image: -ms-linear-gradient(rgba(255,255,255,0), #f1f1f1);
- background-image: -o-linear-gradient(rgba(255,255,255,0), #f1f1f1);
- -webkit-appearance: none;
- -moz-appearance: none;
- appearance: none;
- *overflow: visible;
- *display: inline;
- *zoom: 1;
- }
-
- #goog-wm-sb:hover,
- #goog-wm-sb:focus {
- border-color: #aaa;
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
- background-color: #f8f8f8;
- }
-
- #goog-wm-qt:hover,
- #goog-wm-qt:focus {
- border-color: #105cb6;
- outline: 0;
- color: #222;
- }
-
- input::-moz-focus-inner {
- padding: 0;
- border: 0;
- }
- </style>
- </head>
- <body>
- <div class="container">
- <h1>Not found <span>:(</span></h1>
- <p>Sorry, but the page you were trying to view does not exist.</p>
- <p>It looks like this was the result of either:</p>
- <ul>
- <li>a mistyped address</li>
- <li>an out-of-date link</li>
- </ul>
- </div>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/ajax_failure.jsp
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/ajax_failure.jsp b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/ajax_failure.jsp
deleted file mode 100644
index d00cbfb..0000000
--- a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/ajax_failure.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%
- int ajaxReturnCode = 401;
- //PropertiesUtil.getIntProperty("xa.ajax.auth.required.code", 401);
- response.sendError(ajaxReturnCode);
-%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
-Failure
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/ajax_success.html
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/ajax_success.html b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/ajax_success.html
deleted file mode 100644
index 52023ca..0000000
--- a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/ajax_success.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Insert title here</title>
-</head>
-<body>
-Success
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/favicon.ico
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/favicon.ico b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/favicon.ico
deleted file mode 100644
index 62604cb..0000000
Binary files a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/favicon.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/fonts/fontawesome/FontAwesome.otf
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/fonts/fontawesome/FontAwesome.otf b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/fonts/fontawesome/FontAwesome.otf
deleted file mode 100644
index 7012545..0000000
Binary files a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/fonts/fontawesome/FontAwesome.otf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/02360dd5/ambari-logsearch/ambari-logsearch-web/src/main/webapp/fonts/fontawesome/fontawesome-webfont.eot
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/fonts/fontawesome/fontawesome-webfont.eot b/ambari-logsearch/ambari-logsearch-web/src/main/webapp/fonts/fontawesome/fontawesome-webfont.eot
deleted file mode 100644
index 0662cb9..0000000
Binary files a/ambari-logsearch/ambari-logsearch-web/src/main/webapp/fonts/fontawesome/fontawesome-webfont.eot and /dev/null differ