You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/10 10:15:46 UTC
ignite git commit: IGNITE-843 Rename to webconsole.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 acd078aee -> 006baed10
IGNITE-843 Rename to webconsole.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/006baed1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/006baed1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/006baed1
Branch: refs/heads/ignite-843
Commit: 006baed102b235008810f902acddbf5b741daa8e
Parents: acd078a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Sep 10 15:16:22 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Sep 10 15:16:22 2015 +0700
----------------------------------------------------------------------
modules/control-center-agent/README.txt | 20 ++++++++++----------
.../apache/ignite/agent/AgentConfiguration.java | 4 ++--
.../handlers/DatabaseMetadataExtractor.java | 2 +-
.../control-center-web/src/main/js/DEVNOTES.txt | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/006baed1/modules/control-center-agent/README.txt
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/README.txt b/modules/control-center-agent/README.txt
index 67d1f36..cdf384d 100644
--- a/modules/control-center-agent/README.txt
+++ b/modules/control-center-agent/README.txt
@@ -1,27 +1,27 @@
Ignite Web Agent
======================================
-Ignite Web Agent is a java standalone application that allow to connect Ignite Grid to Ignite Web Control Center.
-Ignite Web Agent communicates with grid nodes via REST interface and connects to Ignite Web Control Center via web-socket.
+Ignite Web Agent is a java standalone application that allow to connect Ignite Grid to Ignite Web Console.
+Ignite Web Agent communicates with grid nodes via REST interface and connects to Ignite Web Console via web-socket.
Two main functions of Ignite Web Agent:
- 1. Proxy between Ignite Web Control Center and Ignite Grid to execute SQL statements and collect metrics for monitoring.
+ 1. Proxy between Ignite Web Console and Ignite Grid to execute SQL statements and collect metrics for monitoring.
You may need to specify URI for connect to Ignite REST server via "-n" option.
- 2. Proxy between Ignite Web Control Center and user RDBMS to collect database metadata for later CacheTypeMetadata configuration.
+ 2. Proxy between Ignite Web Console and user RDBMS to collect database metadata for later CacheTypeMetadata configuration.
You may need to copy JDBC driver into "./jdbc-drivers" subfolder or specify path via "-drv" option.
Usage example:
- ignite-control-center-agent.sh -t 1a2b3c4d5f -s wss://control-center.example.com
+ ignite-control-center-agent.sh -t 1a2b3c4d5f -s wss://webconsole.example.com
Test drive of Ignite Web Agent:
In order to simplify evaluation two test drive modes were implemented:
- 1) Get security token on Web Control Center "Profile" screen.
+ 1) Get security token on Web Console "Profile" screen.
2) Test drive for metadata load from database. Activated by option: -tm or --test-drive-metadata.
In this mode an in-memory H2 database will started.
How to evaluate:
- 2.1) Go to Ignite Web Control Center "Metadata" screen.
+ 2.1) Go to Ignite Web Console "Metadata" screen.
2.2) Select "Load from database".
2.3) Select H2 driver and enter JDBC URL: "jdbc:h2:mem:test-drive-db".
2.4) You should see list of available schemas and tables. Select some of them and click "Save".
@@ -29,7 +29,7 @@ Test drive of Ignite Web Agent:
3) Test drive for SQL. Activated by option: -ts or --test-drive-sql.
In this mode internal Ignite node will be started. Cache created and populated with data.
How to evaluate:
- 3.1) Go to Ignite Web Control Center "SQL" menu and select "Create new notebook" menu item.
+ 3.1) Go to Ignite Web Console "SQL" menu and select "Create new notebook" menu item.
3.2) In notebook paragraph enter SQL queries for tables: "Country, Department, Employee" in "test-drive-employee" cache
and for tables: "Parking, Car" in "test-drive-car" cache.
@@ -55,7 +55,7 @@ Configuration file:
Example configuration file:
token=1a2b3c4d5f
- serverURI=wss://control-center.example.com:3001
+ serverURI=wss://webconsole.example.com:3001
test-drive-sql=true
Options:
@@ -77,7 +77,7 @@ Options:
User's security token.
-s, --server-uri
- URI for connect to Ignite Web Agent, for example: "wss://control-center.example.com:3001".
+ URI for connect to Ignite Web Agent, for example: "wss://webconsole.example.com:3001".
Default: "wss://localhost:3001".
-tm, --test-drive-metadata
http://git-wip-us.apache.org/repos/asf/ignite/blob/006baed1/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
index 6d7a4cf..cd27e4f 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
@@ -39,8 +39,8 @@ public class AgentConfiguration {
private String token;
/** */
- @Parameter(names = {"-s", "--server-uri"}, description = "URI for connect to Ignite Web Control Center via " +
- "web-socket protocol, for example: wss://control-center.my-company.com:3001")
+ @Parameter(names = {"-s", "--server-uri"}, description = "URI for connect to Ignite Web Console via " +
+ "web-socket protocol, for example: wss://webconsole.my-company.com:3001")
private String srvUri;
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/006baed1/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
index dd0d0bf..3490e8d 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
@@ -124,7 +124,7 @@ public class DatabaseMetadataExtractor {
}
/**
- * Wrapper class for later to be transformed to JSON and send to Web Control Center.
+ * Wrapper class for later to be transformed to JSON and send to Web Console.
*/
private static class JdbcDriver {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/006baed1/modules/control-center-web/src/main/js/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/DEVNOTES.txt b/modules/control-center-web/src/main/js/DEVNOTES.txt
index 1673e98..4859cf1 100644
--- a/modules/control-center-web/src/main/js/DEVNOTES.txt
+++ b/modules/control-center-web/src/main/js/DEVNOTES.txt
@@ -1,4 +1,4 @@
-Ignite Web Control Center Instructions
+Ignite Web Console Instructions
======================================
How to deploy:
@@ -18,4 +18,4 @@ How to run:
1.2 Run "mongod".
2. In new terminal change directory '$IGNITE_HOME/modules/control-center-web/src/main/js'.
3. Start application by executing "npm start".
-4. In browser open: http://localhost:3000
\ No newline at end of file
+4. In browser open: http://localhost:3000