Repository: tinkerpop Updated Branches: refs/heads/master ce60df3de -> 849563fe3
Removed graphite/ganglia configs now that they are optional Also added some extra links in the docs about this CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/849563fe Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/849563fe Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/849563fe Branch: refs/heads/master Commit: 849563fe3773d504d6ba2f61ee640547277760de Parents: ce60df3 Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Jul 12 16:32:13 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Jul 12 16:32:13 2017 -0400 ---------------------------------------------------------------------- docs/src/reference/gremlin-applications.asciidoc | 4 ++-- .../gremlin/console/jsr223/gremlin-server-integration.yaml | 4 +--- gremlin-server/conf/gremlin-server-neo4j.yaml | 4 +--- gremlin-server/conf/gremlin-server-rest-secure.yaml | 4 +--- gremlin-server/conf/gremlin-server-secure.yaml | 4 +--- gremlin-server/conf/gremlin-server-spark.yaml | 4 +--- gremlin-server/conf/gremlin-server.yaml | 4 +--- .../gremlin/driver/remote/gremlin-server-integration.yaml | 4 +--- .../tinkerpop/gremlin/server/gremlin-server-integration.yaml | 4 +--- 9 files changed, 10 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc index 6263796..287c479 100644 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@ -1150,11 +1150,11 @@ The following table describes the various YAML configuration options that Gremli |metrics.csvReporter.fileName |The file to write metrics to. |_none_ |metrics.csvReporter.interval |Time in milliseconds between reports of metrics to file. |180000 |metrics.gangliaReporter.addressingMode |Set to `MULTICAST` or `UNICAST`. |_none_ -|metrics.gangliaReporter.enabled |Turns on Ganglia reporting of metrics. |false +|metrics.gangliaReporter.enabled |Turns on Ganglia reporting of metrics. Additional link:http://tinkerpop.apache.org/docs/3.3.0/reference/#metrics[setup] is required. |false |metrics.gangliaReporter.host |Define the Ganglia host to report Metrics to. |localhost |metrics.gangliaReporter.interval |Time in milliseconds between reports of metrics for Ganglia. |180000 |metrics.gangliaReporter.port |Define the Ganglia port to report Metrics to. |8649 -|metrics.graphiteReporter.enabled |Turns on Graphite reporting of metrics. |false +|metrics.graphiteReporter.enabled |Turns on Graphite reporting of metrics. Additional link:http://tinkerpop.apache.org/docs/3.3.0/reference/#metrics[setup] is required. |false |metrics.graphiteReporter.host |Define the Graphite host to report Metrics to. |localhost |metrics.graphiteReporter.interval |Time in milliseconds between reports of metrics for Graphite. |180000 |metrics.graphiteReporter.port |Define the Graphite port to report Metrics to. |2003 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml ---------------------------------------------------------------------- diff --git a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml index 8ba9372..59f21f4 100644 --- a/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml +++ b/gremlin-console/src/test/resources/org/apache/tinkerpop/gremlin/console/jsr223/gremlin-server-integration.yaml @@ -36,9 +36,7 @@ metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, jmxReporter: {enabled: true}, - slf4jReporter: {enabled: true, interval: 180000}, - gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST}, - graphiteReporter: {enabled: false, interval: 180000}} + slf4jReporter: {enabled: true, interval: 180000}} strictTransactionManagement: false maxInitialLineLength: 4096 maxHeaderSize: 8192 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/gremlin-server/conf/gremlin-server-neo4j.yaml ---------------------------------------------------------------------- diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml index 5a5fa16..accdac3 100644 --- a/gremlin-server/conf/gremlin-server-neo4j.yaml +++ b/gremlin-server/conf/gremlin-server-neo4j.yaml @@ -50,9 +50,7 @@ metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, jmxReporter: {enabled: true}, - slf4jReporter: {enabled: true, interval: 180000}, - gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST}, - graphiteReporter: {enabled: false, interval: 180000}} + slf4jReporter: {enabled: true, interval: 180000}} strictTransactionManagement: false maxInitialLineLength: 4096 maxHeaderSize: 8192 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/gremlin-server/conf/gremlin-server-rest-secure.yaml ---------------------------------------------------------------------- diff --git a/gremlin-server/conf/gremlin-server-rest-secure.yaml b/gremlin-server/conf/gremlin-server-rest-secure.yaml index 35c9b5d..bc92841 100644 --- a/gremlin-server/conf/gremlin-server-rest-secure.yaml +++ b/gremlin-server/conf/gremlin-server-rest-secure.yaml @@ -47,9 +47,7 @@ metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, jmxReporter: {enabled: true}, - slf4jReporter: {enabled: true, interval: 180000}, - gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST}, - graphiteReporter: {enabled: false, interval: 180000}} + slf4jReporter: {enabled: true, interval: 180000}} strictTransactionManagement: false maxInitialLineLength: 4096 maxHeaderSize: 8192 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/gremlin-server/conf/gremlin-server-secure.yaml ---------------------------------------------------------------------- diff --git a/gremlin-server/conf/gremlin-server-secure.yaml b/gremlin-server/conf/gremlin-server-secure.yaml index 36d2292..e715318 100644 --- a/gremlin-server/conf/gremlin-server-secure.yaml +++ b/gremlin-server/conf/gremlin-server-secure.yaml @@ -49,9 +49,7 @@ metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, jmxReporter: {enabled: true}, - slf4jReporter: {enabled: true, interval: 180000}, - gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST}, - graphiteReporter: {enabled: false, interval: 180000}} + slf4jReporter: {enabled: true, interval: 180000}} strictTransactionManagement: false maxInitialLineLength: 4096 maxHeaderSize: 8192 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/gremlin-server/conf/gremlin-server-spark.yaml ---------------------------------------------------------------------- diff --git a/gremlin-server/conf/gremlin-server-spark.yaml b/gremlin-server/conf/gremlin-server-spark.yaml index 4ad719e..f9c8a13 100644 --- a/gremlin-server/conf/gremlin-server-spark.yaml +++ b/gremlin-server/conf/gremlin-server-spark.yaml @@ -63,9 +63,7 @@ metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, jmxReporter: {enabled: true}, - slf4jReporter: {enabled: true, interval: 180000}, - gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST}, - graphiteReporter: {enabled: false, interval: 180000}} + slf4jReporter: {enabled: true, interval: 180000}} strictTransactionManagement: false maxInitialLineLength: 4096 maxHeaderSize: 8192 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/gremlin-server/conf/gremlin-server.yaml ---------------------------------------------------------------------- diff --git a/gremlin-server/conf/gremlin-server.yaml b/gremlin-server/conf/gremlin-server.yaml index 05e0eb6..2cf5cbf 100644 --- a/gremlin-server/conf/gremlin-server.yaml +++ b/gremlin-server/conf/gremlin-server.yaml @@ -40,9 +40,7 @@ metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, jmxReporter: {enabled: true}, - slf4jReporter: {enabled: true, interval: 180000}, - gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST}, - graphiteReporter: {enabled: false, interval: 180000}} + slf4jReporter: {enabled: true, interval: 180000}} strictTransactionManagement: false maxInitialLineLength: 4096 maxHeaderSize: 8192 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml index 340442a..1e20770 100644 --- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml +++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml @@ -44,9 +44,7 @@ metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, jmxReporter: {enabled: true}, - slf4jReporter: {enabled: true, interval: 180000}, - gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST}, - graphiteReporter: {enabled: false, interval: 180000}} + slf4jReporter: {enabled: true, interval: 180000}} strictTransactionManagement: false maxInitialLineLength: 4096 maxHeaderSize: 8192 http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/849563fe/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml ---------------------------------------------------------------------- diff --git a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml index 5e725bd..89792e4 100644 --- a/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml +++ b/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml @@ -41,9 +41,7 @@ metrics: { consoleReporter: {enabled: true, interval: 180000}, csvReporter: {enabled: true, interval: 180000, fileName: /tmp/gremlin-server-metrics.csv}, jmxReporter: {enabled: true}, - slf4jReporter: {enabled: true, interval: 180000}, - gangliaReporter: {enabled: false, interval: 180000, addressingMode: MULTICAST}, - graphiteReporter: {enabled: false, interval: 180000}} + slf4jReporter: {enabled: true, interval: 180000}} strictTransactionManagement: false maxInitialLineLength: 4096 maxHeaderSize: 8192