You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kh...@apache.org on 2018/03/22 14:11:08 UTC
[geode] branch develop updated (9104dac -> 3d5ad69)
This is an automated email from the ASF dual-hosted git repository.
khowe pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 9104dac GEODE-4859: Preparing GfshCommand to be public interface (#1647)
new 63ebca4 Fix help guide url in Pulse
new 1cca96a GEODE-3922: Fix additional help links
new 3d5ad69 GEODE-3922: Removed pulse-help-custom from gemfire.properties
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
geode-pulse/src/main/resources/gemfire.properties | 1 -
geode-pulse/src/main/webapp/clusterDetail.html | 2 +-
geode-pulse/src/main/webapp/dataBrowser.html | 2 +-
geode-pulse/src/main/webapp/memberDetails.html | 2 +-
.../src/main/webapp/properties/gemfire.properties | 1 -
geode-pulse/src/main/webapp/queryStatistics.html | 6 +-----
geode-pulse/src/main/webapp/regionDetail.html | 2 +-
.../src/main/webapp/scripts/pulsescript/common.js | 20 ++++++++++++++++++++
8 files changed, 25 insertions(+), 11 deletions(-)
--
To stop receiving notification emails like this one, please contact
khowe@apache.org.
[geode] 03/03: GEODE-3922: Removed pulse-help-custom from
gemfire.properties
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khowe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 3d5ad6903c73997af9a31cc2d1cf93c3f192035f
Author: Ken Howe <kh...@pivotal.io>
AuthorDate: Wed Mar 21 15:29:16 2018 -0700
GEODE-3922: Removed pulse-help-custom from gemfire.properties
Removing the property because Help URLs are now dynamic.
---
geode-pulse/src/main/resources/gemfire.properties | 1 -
geode-pulse/src/main/webapp/properties/gemfire.properties | 1 -
2 files changed, 2 deletions(-)
diff --git a/geode-pulse/src/main/resources/gemfire.properties b/geode-pulse/src/main/resources/gemfire.properties
index 7f6a70c..99b6d1e 100644
--- a/geode-pulse/src/main/resources/gemfire.properties
+++ b/geode-pulse/src/main/resources/gemfire.properties
@@ -25,7 +25,6 @@ pulse-writes-custom=Writes
pulse-reads-custom=Reads
pulse-monitoring-custom=images/pulse-monitoring.png
pulse-aboutimg-custom=images/about-geode.png
-pulse-help-custom=http://geode.apache.org/docs/guide/15/tools_modules/pulse/pulse-overview.html
pulse-about-custom=The Pulse tool monitors Apache Geode© system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.
pulse-regionstableCaps-custom=Regions
pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count
diff --git a/geode-pulse/src/main/webapp/properties/gemfire.properties b/geode-pulse/src/main/webapp/properties/gemfire.properties
index c10bdaa..f91c2c5 100644
--- a/geode-pulse/src/main/webapp/properties/gemfire.properties
+++ b/geode-pulse/src/main/webapp/properties/gemfire.properties
@@ -23,7 +23,6 @@ pulse-writes-custom=Writes
pulse-reads-custom=Reads
pulse-monitoring-custom=images/pulse-monitoring.png
pulse-aboutimg-custom=images/about-geode.png
-pulse-help-custom=http://geode.apache.org/docs/guide/15/tools_modules/pulse/pulse-overview.html
pulse-about-custom=The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.
pulse-regionstableCaps-custom=Regions
pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count
--
To stop receiving notification emails like this one, please contact
khowe@apache.org.
[geode] 02/03: GEODE-3922: Fix additional help links
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khowe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 1cca96a579c025e3daa731b9d9b9c72175b598de
Author: Ken Howe <kh...@pivotal.io>
AuthorDate: Wed Mar 21 12:43:22 2018 -0700
GEODE-3922: Fix additional help links
Change default the value of pulse-help-custom property in the default
gemfire.properties file to be a valid link.
---
geode-pulse/src/main/resources/gemfire.properties | 2 +-
geode-pulse/src/main/webapp/dataBrowser.html | 2 +-
geode-pulse/src/main/webapp/memberDetails.html | 2 +-
geode-pulse/src/main/webapp/properties/gemfire.properties | 2 +-
geode-pulse/src/main/webapp/queryStatistics.html | 6 +-----
geode-pulse/src/main/webapp/regionDetail.html | 2 +-
6 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/geode-pulse/src/main/resources/gemfire.properties b/geode-pulse/src/main/resources/gemfire.properties
index 48899de..7f6a70c 100644
--- a/geode-pulse/src/main/resources/gemfire.properties
+++ b/geode-pulse/src/main/resources/gemfire.properties
@@ -25,7 +25,7 @@ pulse-writes-custom=Writes
pulse-reads-custom=Reads
pulse-monitoring-custom=images/pulse-monitoring.png
pulse-aboutimg-custom=images/about-geode.png
-pulse-help-custom=http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html
+pulse-help-custom=http://geode.apache.org/docs/guide/15/tools_modules/pulse/pulse-overview.html
pulse-about-custom=The Pulse tool monitors Apache Geode© system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.
pulse-regionstableCaps-custom=Regions
pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count
diff --git a/geode-pulse/src/main/webapp/dataBrowser.html b/geode-pulse/src/main/webapp/dataBrowser.html
index b6d49f1..478bce5 100644
--- a/geode-pulse/src/main/webapp/dataBrowser.html
+++ b/geode-pulse/src/main/webapp/dataBrowser.html
@@ -137,7 +137,7 @@
</div>
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a href="#" onclick="return openHelpGuide();" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a target="_blank" href="#" onclick="return openHelpGuide();" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
diff --git a/geode-pulse/src/main/webapp/memberDetails.html b/geode-pulse/src/main/webapp/memberDetails.html
index 18a5eac..fa5998f 100644
--- a/geode-pulse/src/main/webapp/memberDetails.html
+++ b/geode-pulse/src/main/webapp/memberDetails.html
@@ -128,7 +128,7 @@
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a target="_blank" href="#" onclick="return openHelpGuide();" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
diff --git a/geode-pulse/src/main/webapp/properties/gemfire.properties b/geode-pulse/src/main/webapp/properties/gemfire.properties
index 613bde9..c10bdaa 100644
--- a/geode-pulse/src/main/webapp/properties/gemfire.properties
+++ b/geode-pulse/src/main/webapp/properties/gemfire.properties
@@ -23,7 +23,7 @@ pulse-writes-custom=Writes
pulse-reads-custom=Reads
pulse-monitoring-custom=images/pulse-monitoring.png
pulse-aboutimg-custom=images/about-geode.png
-pulse-help-custom=http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html
+pulse-help-custom=http://geode.apache.org/docs/guide/15/tools_modules/pulse/pulse-overview.html
pulse-about-custom=The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.
pulse-regionstableCaps-custom=Regions
pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count
diff --git a/geode-pulse/src/main/webapp/queryStatistics.html b/geode-pulse/src/main/webapp/queryStatistics.html
index 0b0e3e1..cbaf157 100644
--- a/geode-pulse/src/main/webapp/queryStatistics.html
+++ b/geode-pulse/src/main/webapp/queryStatistics.html
@@ -148,11 +148,7 @@
</div>
</div>
<div class="left headerTopSeperator"></div>
- <div class="left">
- <a data-prod-custom="pulse-help-custom" target="_blank"
- href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html"
- class="left headerTopLinks">Help</a>
- </div>
+ <div class="left"><a target="_blank" href="#" onclick="return openHelpGuide();" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
diff --git a/geode-pulse/src/main/webapp/regionDetail.html b/geode-pulse/src/main/webapp/regionDetail.html
index 94d3b88..e303d60 100644
--- a/geode-pulse/src/main/webapp/regionDetail.html
+++ b/geode-pulse/src/main/webapp/regionDetail.html
@@ -210,7 +210,7 @@
<!-- Version Details Popup -->
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a target="_blank" href="#" onclick="return openHelpGuide();" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
--
To stop receiving notification emails like this one, please contact
khowe@apache.org.
[geode] 01/03: Fix help guide url in Pulse
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khowe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 63ebca4a09a06d40ab0e3a25022fd1b833f28682
Author: Sai Boorlagadda <sa...@gmail.com>
AuthorDate: Tue Mar 20 15:35:27 2018 -0700
Fix help guide url in Pulse
---
geode-pulse/src/main/webapp/clusterDetail.html | 2 +-
geode-pulse/src/main/webapp/dataBrowser.html | 2 +-
.../src/main/webapp/scripts/pulsescript/common.js | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/geode-pulse/src/main/webapp/clusterDetail.html b/geode-pulse/src/main/webapp/clusterDetail.html
index 26ae3d1..c74299d 100644
--- a/geode-pulse/src/main/webapp/clusterDetail.html
+++ b/geode-pulse/src/main/webapp/clusterDetail.html
@@ -118,7 +118,7 @@
</div>
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a href="#" onclick="return openHelpGuide();" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
diff --git a/geode-pulse/src/main/webapp/dataBrowser.html b/geode-pulse/src/main/webapp/dataBrowser.html
index dac5a4d..b6d49f1 100644
--- a/geode-pulse/src/main/webapp/dataBrowser.html
+++ b/geode-pulse/src/main/webapp/dataBrowser.html
@@ -137,7 +137,7 @@
</div>
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a href="#" onclick="return openHelpGuide();" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
index 5de8b4c..b993483 100644
--- a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
+++ b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js
@@ -114,6 +114,26 @@ function getCookie(c_name) {
}
}
+function openHelpGuide() {
+ $.getJSON("pulseVersion", function(data) {
+ var pulseVersion = data.pulseVersion;
+ if (data.pulseVersion != undefined && data.pulseVersion != "") {
+ //1.6.0-SNAPSHOT
+ var pulseGuideLocation;
+ var tokens = pulseVersion.split(".");
+ if(pulseVersion.indexOf("SNAPSHOT") > 0) {
+ //fall back to one version older guide in case if its snapshot.
+ pulseGuideLocation = tokens[0] + (tokens[1] - 1);
+ } else {
+ pulseGuideLocation = tokens[0]+tokens[1];
+ }
+ var url = `http://geode.apache.org/docs/guide/${pulseGuideLocation}/tools_modules/pulse/pulse-overview.html`;
+ window.open(url, '_blank');
+ }
+ });
+ return false;
+}
+
// function used for setting cookies
function setCookie(c_name, value, exdays) {
var exdate = new Date();
--
To stop receiving notification emails like this one, please contact
khowe@apache.org.