[1/3] incubator-senssoft git commit: Removed x-pack from official senssoft elasticsearch docker image.
Repository: incubator-senssoft Updated Branches: refs/heads/kubernetes [created] bc012abc8 Removed x-pack from official senssoft elasticsearch docker image. Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/93eb9eb1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/93eb9eb1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/93eb9eb1 Branch: refs/heads/kubernetes Commit: 93eb9eb1971f42066b7b129317871ba641c89e57 Parents: 2b93e9b Author: Michelle BeardAuthored: Fri Feb 9 16:59:06 2018 -0500 Committer: Michelle Beard Committed: Fri Feb 9 16:59:06 2018 -0500 -- docker/elasticsearch/.env | 9 +++ docker/elasticsearch/Dockerfile | 5 docker/elasticsearch/config/elasticsearch.yml | 28 -- 3 files changed, 29 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/93eb9eb1/docker/elasticsearch/.env -- diff --git a/docker/elasticsearch/.env b/docker/elasticsearch/.env new file mode 100644 index 000..96e09bb --- /dev/null +++ b/docker/elasticsearch/.env @@ -0,0 +1,9 @@ +CLUSTER_NAME=SensSoft +NODE_MASTER=true +NODE_DATA=true +NODE_NAME=soft-01 +NETWORK_HOST=0.0.0.0 +NODE_COORDINATE=true +HTTP_ENABLE=true +HTTP_CORS_ENABLE=true +HTTP_CORS_ALLOW_ORIGIN='*' http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/93eb9eb1/docker/elasticsearch/Dockerfile -- diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile index 7cdbae7..6256564 100644 --- a/docker/elasticsearch/Dockerfile +++ b/docker/elasticsearch/Dockerfile @@ -25,3 +25,8 @@ ENV CLUSTER_NAME SensSoft # Kubernetes requires swap is turned off ENV MEMORY_LOCK false + +# DELETE XPACK Plugin +RUN elasticsearch-plugin remove x-pack --silent + +EXPOSE 9200 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/93eb9eb1/docker/elasticsearch/config/elasticsearch.yml -- diff --git a/docker/elasticsearch/config/elasticsearch.yml b/docker/elasticsearch/config/elasticsearch.yml index ca31f63..6596dec 100644 --- a/docker/elasticsearch/config/elasticsearch.yml +++ b/docker/elasticsearch/config/elasticsearch.yml @@ -13,19 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Custom config borrowed from Pires: https://github.com/pires/docker-elasticsearch-kubernetes + cluster: - name: ${CLUSTER_NAME} + name: ${CLUSTER_NAME:SensSoft} node: - master: ${NODE_MASTER} - data: ${NODE_DATA} - #name: ${NODE_NAME} - ingest: ${NODE_INGEST} - max_local_storage_nodes: ${MAX_LOCAL_STORAGE_NODES} + master: ${NODE_MASTER:true} + data: ${NODE_DATA:true} + name: ${NODE_NAME:${HOSTNAME}} + ingest: ${NODE_INGEST:true} + max_local_storage_nodes: ${MAX_LOCAL_STORAGE_NODES:1} -network.host: ${NETWORK_HOST} +network.host: ${NETWORK_HOST:0.0.0.0} -search.remote.connect: ${NODE_COORDINATE} +search.remote.connect: ${NODE_COORDINATE:true} path: data: /usr/share/elasticsearch/data @@ -35,14 +37,14 @@ bootstrap: memory_lock: ${MEMORY_LOCK} http: - enabled: ${HTTP_ENABLE} + enabled: ${HTTP_ENABLE:true} compression: true cors: -enabled: ${HTTP_CORS_ENABLE} -allow-origin: ${HTTP_CORS_ALLOW_ORIGIN} +enabled: ${HTTP_CORS_ENABLE:true} +allow-origin: ${HTTP_CORS_ALLOW_ORIGIN:*} # Prevent the "split brain" by configuring the majority of nodes (total number of nodes / 2 + 1): discovery: zen: -ping.unicast.hosts: ${DISCOVERY_SERVICE} -minimum_master_nodes: ${NUMBER_OF_MASTERS} +ping.unicast.hosts: ${DISCOVERY_SERVICE:127.0.0.1, [::1]} +minimum_master_nodes: ${NUMBER_OF_MASTERS:1}
incubator-senssoft-useralejs git commit: Keep build directory as our distribution
Repository: incubator-senssoft-useralejs Updated Branches: refs/heads/SENSSOFT-192 6c64cfa17 -> 1349cadda Keep build directory as our distribution Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/commit/1349cadd Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/tree/1349cadd Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/diff/1349cadd Branch: refs/heads/SENSSOFT-192 Commit: 1349cadda2f6532077138d3a0a937e35424c7a47 Parents: 6c64cfa Author: msbeardAuthored: Mon Feb 12 10:35:28 2018 -0500 Committer: msbeard Committed: Mon Feb 12 10:35:28 2018 -0500 -- .gitignore| 1 - build/UserAleWebExtension/background.js | 388 +++ build/UserAleWebExtension/content.js | 729 + build/UserAleWebExtension/icons/border-48.png | Bin 0 -> 225 bytes build/UserAleWebExtension/manifest.json | 29 + build/UserAleWebExtension/options.js | 56 ++ build/UserAleWebExtension/optionsPage.html| 37 ++ build/userale-1.0.0.js| 702 build/userale-1.0.0.min.js| 1 + 9 files changed, 1942 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/1349cadd/.gitignore -- diff --git a/.gitignore b/.gitignore index 8ed5199..4c0ed70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .idea /node_modules/* -/build/* /logs/* /.git/* npm-debug.log http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/1349cadd/build/UserAleWebExtension/background.js -- diff --git a/build/UserAleWebExtension/background.js b/build/UserAleWebExtension/background.js new file mode 100644 index 000..633dc71 --- /dev/null +++ b/build/UserAleWebExtension/background.js @@ -0,0 +1,388 @@ +/* eslint-disable */ + +// these are default values, which can be overridden by the user on the options page +var userAleHost = 'http://localhost:8000'; +var userAleScript = 'userale-0.2.1.min.js'; +var toolUser = 'nobody'; +var toolName = 'test_app'; +var toolVersion = '0.1.0'; + +/* eslint-enable */ + +var prefix = 'USERALE_'; + +var CONFIG_CHANGE = prefix + 'CONFIG_CHANGE'; +var ADD_LOG = prefix + 'ADD_LOG'; + +/** + * Creates a function to normalize the timestamp of the provided event. + * @param {Object} e An event containing a timeStamp property. + * @return {timeStampScale~tsScaler} The timestamp normalizing function. + */ +function timeStampScale(e) { + if (e.timeStamp && e.timeStamp > 0) { +var delta = Date.now() - e.timeStamp; +/** + * Returns a timestamp depending on various browser quirks. + * @param {?Number} ts A timestamp to use for normalization. + * @return {Number} A normalized timestamp. + */ +var tsScaler; + +if (delta < 0) { + tsScaler = function () { +return e.timeStamp / 1000; + }; +} else if (delta > e.timeStamp) { + var navStart = performance.timing.navigationStart; + tsScaler = function (ts) { +return ts + navStart; + } +} else { + tsScaler = function (ts) { +return ts; + } +} + } else { +tsScaler = function () { return Date.now(); }; + } + + return tsScaler; +} + +/* + * 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. + */ + +var logs$1; +var config$1; + +// Interval Logging Globals +var intervalID; +var intervalType; +var intervalPath; +var intervalTimer; +var intervalCounter; +var intervalLog; + +var filterHandler = null; +var mapHandler = null; + +/** + * Assigns the config and log container to be used by the logging functions. + * @param {Array} newLogs Log container. + * @param {Object} newConfig Configuration to use while logging. + */ +function initPackager(newLogs,
[3/3] incubator-senssoft git commit: Merge branch 'master' into master
Merge branch 'master' into master Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/bc012abc Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/bc012abc Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/bc012abc Branch: refs/heads/kubernetes Commit: bc012abc8943aed02bc32bec3fb0f6deb2260b3c Parents: 1196d06 6cdd5ce Author: Michelle BAuthored: Mon Feb 12 09:34:25 2018 -0500 Committer: GitHub Committed: Mon Feb 12 09:34:25 2018 -0500 -- .gitignore | 2 + LICENSE| 2 +- docker/README.md | 4 +- docker/docker-compose.yml | 8 +- docker/kibana/Dockerfile | 2 + docker/kibana/config/kibana.yml| 2 +- docker/logstash/Dockerfile | 6 + docker/logstash/config/logstash-userale.conf | 2 +- docker/logstash/templates/userale.json | 47 +--- release/README.md | 30 +++ release/clone-and-configure-repos.sh | 115 + release/common.sh | 71 ++ release/make-release-artifacts.sh | 250 site/_includes/footer.html | 2 +- site/_site/community/index.html| 2 +- site/_site/distill/index.html | 2 +- site/_site/docs/contributing.html | 2 +- site/_site/docs/contributing/index.html| 2 +- site/_site/docs/distill/analytics.html | 2 +- site/_site/docs/distill/api.html | 2 +- site/_site/docs/distill/changelog.html | 2 +- site/_site/docs/distill/http.html | 2 +- site/_site/docs/distill/index.html | 2 +- site/_site/docs/distill/models.html| 2 +- site/_site/docs/distill/start.html | 2 +- site/_site/docs/distill/utilities.html | 2 +- site/_site/docs/index.html | 2 +- site/_site/docs/stout/index.html | 2 +- site/_site/docs/stout/start.html | 2 +- site/_site/docs/system/index.html | 2 +- site/_site/docs/tap/index.html | 2 +- site/_site/docs/userale/index.html | 2 +- site/_site/docs/useralejs/contributing.html| 2 +- site/_site/docs/useralejs/index.html | 2 +- site/_site/docs/useralejs/testing.html | 2 +- site/_site/docs/useralejs/troubleshooting.html | 2 +- site/_site/docs/useralepy/api.html | 2 +- site/_site/docs/useralepy/changelog.html | 2 +- site/_site/docs/useralepy/index.html | 2 +- site/_site/docs/useralepy/start.html | 2 +- site/_site/docs/useralepyqt/api.html | 2 +- site/_site/docs/useralepyqt/changelog.html | 2 +- site/_site/docs/useralepyqt/index.html | 2 +- site/_site/docs/useralepyqt/start.html | 2 +- site/_site/index.html | 2 +- site/_site/releases/index.html | 2 +- site/_site/stout/index.html| 2 +- site/_site/system/index.html | 2 +- site/_site/tap/index.html | 2 +- site/_site/userale/index.html | 2 +- 50 files changed, 535 insertions(+), 80 deletions(-) --
[2/3] incubator-senssoft git commit: Elasticsearch kubernetes w untested kibana build.
Elasticsearch kubernetes w untested kibana build. Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/1196d061 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/1196d061 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/1196d061 Branch: refs/heads/kubernetes Commit: 1196d061bbc48d340e654ece47a3424a9356 Parents: 93eb9eb Author: Michelle BeardAuthored: Fri Feb 9 18:20:37 2018 -0500 Committer: Michelle Beard Committed: Fri Feb 9 18:20:37 2018 -0500 -- kubernetes/README.md | 3 ++ kubernetes/cleanup.sh| 5 +++ kubernetes/deploy.sh | 9 + kubernetes/es-client.yaml| 71 +++ kubernetes/es-data.yaml | 61 ++ kubernetes/es-discovery-svc.yaml | 15 kubernetes/es-master.yaml| 61 ++ kubernetes/es-svc.yaml | 15 kubernetes/kibana-svc.yaml | 13 +++ kubernetes/kibana.yaml | 32 kubernetes/minikube_start.sh | 1 + kubernetes/minikube_stop.sh | 3 ++ kubernetes/status.sh | 1 + 13 files changed, 290 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/README.md -- diff --git a/kubernetes/README.md b/kubernetes/README.md new file mode 100644 index 000..071386c --- /dev/null +++ b/kubernetes/README.md @@ -0,0 +1,3 @@ +#TODO +Instructions on launching stack. +Simplify scripts http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/cleanup.sh -- diff --git a/kubernetes/cleanup.sh b/kubernetes/cleanup.sh new file mode 100755 index 000..7dda16b --- /dev/null +++ b/kubernetes/cleanup.sh @@ -0,0 +1,5 @@ +kubectl delete -f es-data.yaml +kubectl delete -f es-client.yaml +kubectl delete -f es-master.yaml +kubectl delete -f es-svc.yaml +kubectl delete -f es-discovery-svc.yaml http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/deploy.sh -- diff --git a/kubernetes/deploy.sh b/kubernetes/deploy.sh new file mode 100755 index 000..84c5eb8 --- /dev/null +++ b/kubernetes/deploy.sh @@ -0,0 +1,9 @@ +kubectl create -f es-discovery-svc.yaml +kubectl create -f es-svc.yaml +kubectl create -f es-master.yaml +kubectl rollout status -f es-master.yaml +kubectl create -f es-client.yaml +kubectl rollout status -f es-client.yaml +kubectl create -f es-data.yaml +kubectl rollout status -f es-data.yaml + http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/es-client.yaml -- diff --git a/kubernetes/es-client.yaml b/kubernetes/es-client.yaml new file mode 100644 index 000..d3d7de9 --- /dev/null +++ b/kubernetes/es-client.yaml @@ -0,0 +1,71 @@ +apiVersion: apps/v1beta1 +kind: Deployment +metadata: + name: es-client + labels: +component: elasticsearch +role: client +spec: + replicas: 2 + template: +metadata: + labels: +component: elasticsearch +role: client +spec: + initContainers: + - name: init-sysctl +image: busybox:1.27.2 +command: +- sysctl +- -w +- vm.max_map_count=262144 +securityContext: + privileged: true + containers: + - name: es-client +image: senssoft/elasticsearch:latest +env: +- name: NAMESPACE + valueFrom: +fieldRef: + fieldPath: metadata.namespace +- name: NODE_NAME + valueFrom: +fieldRef: + fieldPath: metadata.name +- name: NODE_MASTER + value: "false" +- name: NODE_INGEST + value: "false" +- name: DISCOVERY_SERVICE + value: "elasticsearch-discovery" +- name: "NETWORK_HOST" + value: _site_,_lo_ +- name: NODE_DATA + value: "false" +- name: HTTP_ENABLE + value: "true" +- name: ES_JAVA_OPTS + value: -Xms256m -Xmx256m +ports: +- containerPort: 9200 + name: http +- containerPort: 9300 + name: transport +livenessProbe: + tcpSocket: +port: transport +readinessProbe: + httpGet: +path: /_cluster/health +port: http + initialDelaySeconds: 20 + timeoutSeconds: 5 +volumeMounts: +- name: storage +
incubator-senssoft-useralejs git commit: build directory were dist files go
Repository: incubator-senssoft-useralejs Updated Branches: refs/heads/master e2ab5f7aa -> b656f6af8 build directory were dist files go Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/commit/b656f6af Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/tree/b656f6af Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/diff/b656f6af Branch: refs/heads/master Commit: b656f6af8ad9d3042b6ad7768e0d7dbbe614cb08 Parents: e2ab5f7 Author: msbeardAuthored: Mon Feb 12 10:37:30 2018 -0500 Committer: msbeard Committed: Mon Feb 12 10:37:30 2018 -0500 -- .gitignore | 1 - build/userale-1.0.0.js | 533 build/userale-1.0.0.min.js | 1 + lib/userale.js | 533 lib/userale.min.js | 1 - 5 files changed, 534 insertions(+), 535 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/b656f6af/.gitignore -- diff --git a/.gitignore b/.gitignore index 8ed5199..4c0ed70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .idea /node_modules/* -/build/* /logs/* /.git/* npm-debug.log http://git-wip-us.apache.org/repos/asf/incubator-senssoft-useralejs/blob/b656f6af/build/userale-1.0.0.js -- diff --git a/build/userale-1.0.0.js b/build/userale-1.0.0.js new file mode 100644 index 000..f3d8d67 --- /dev/null +++ b/build/userale-1.0.0.js @@ -0,0 +1,533 @@ +(function (exports) { + 'use strict'; + + var version$1 = "1.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. +*/ + + /** +* Extracts the initial configuration settings from the +* currently executing script tag. +* @return {Object} The extracted configuration object +*/ + function getInitialSettings() { + var settings = {}; + + var script = document.currentScript || (function () { + var scripts = document.getElementsByTagName('script'); + return scripts[scripts.length - 1]; + })(); + + var get = script ? script.getAttribute.bind(script) : function() { return null; }; + + settings.autostart = get('data-autostart') === 'false' ? false : true; + settings.url = get('data-url') || 'http://localhost:8000'; + settings.transmitInterval = +get('data-interval') || 5000; + settings.logCountThreshold = +get('data-threshold') || 5; + settings.userId = get('data-user') || null; + settings.version = get('data-version') || null; + settings.logDetails = get('data-log-details') === 'true' ? true : false; + settings.resolution = +get('data-resolution') || 500; + settings.toolName = get('data-tool') || null; + settings.userFromParams = get('data-user-from-params') || null; + settings.time = timeStampScale(document.createEvent('CustomEvent')); + + return settings; + } + + /** +* Creates a function to normalize the timestamp of the provided event. +* @param {Object} e An event containing a timeStamp property. +* @return {timeStampScale~tsScaler} The timestamp normalizing function. +*/ + function timeStampScale(e) { + if (e.timeStamp && e.timeStamp > 0) { + var delta = Date.now() - e.timeStamp; + /** +* Returns a timestamp depending on various browser quirks. +* @param {?Number} ts A timestamp to use for normalization. +* @return {Number} A normalized timestamp. +*/ + var tsScaler; + + if (delta < 0) { + tsScaler = function () { +