You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by ms...@apache.org on 2018/02/12 14:46:04 UTC
[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 Beard <mb...@draper.com>
Authored: Fri Feb 9 16:59:06 2018 -0500
Committer: Michelle Beard <mb...@draper.com>
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 0000000..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}
[2/3] incubator-senssoft git commit: Elasticsearch kubernetes w
untested kibana build.
Posted by ms...@apache.org.
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: 1196d061bbc48d340e654ece47abbbb3424a9356
Parents: 93eb9eb
Author: Michelle Beard <mb...@draper.com>
Authored: Fri Feb 9 18:20:37 2018 -0500
Committer: Michelle Beard <mb...@draper.com>
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 0000000..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 0000000..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 0000000..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 0000000..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
+ mountPath: /data
+ volumes:
+ - emptyDir:
+ medium: ""
+ name: "storage"
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/es-data.yaml
----------------------------------------------------------------------
diff --git a/kubernetes/es-data.yaml b/kubernetes/es-data.yaml
new file mode 100644
index 0000000..e4f1757
--- /dev/null
+++ b/kubernetes/es-data.yaml
@@ -0,0 +1,61 @@
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+ name: es-data
+ labels:
+ component: elasticsearch
+ role: data
+spec:
+ replicas: 2
+ template:
+ metadata:
+ labels:
+ component: elasticsearch
+ role: data
+ spec:
+ initContainers:
+ - name: init-sysctl
+ image: busybox:1.27.2
+ command:
+ - sysctl
+ - -w
+ - vm.max_map_count=262144
+ securityContext:
+ privileged: true
+ containers:
+ - name: es-data
+ 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: "true"
+ - name: DISCOVERY_SERVICE
+ value: "elasticsearch-discovery"
+ - name: NODE_DATA
+ value: "true"
+ - name: HTTP_ENABLE
+ value: "false"
+ - name: ES_JAVA_OPTS
+ value: -Xms256m -Xmx256m
+ ports:
+ - containerPort: 9300
+ name: transport
+ livenessProbe:
+ tcpSocket:
+ port: transport
+ volumeMounts:
+ - name: storage
+ mountPath: /data
+ volumes:
+ - emptyDir:
+ medium: ""
+ name: "storage"
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/es-discovery-svc.yaml
----------------------------------------------------------------------
diff --git a/kubernetes/es-discovery-svc.yaml b/kubernetes/es-discovery-svc.yaml
new file mode 100644
index 0000000..cfdc5da
--- /dev/null
+++ b/kubernetes/es-discovery-svc.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: elasticsearch-discovery
+ labels:
+ component: elasticsearch
+ role: master
+spec:
+ selector:
+ component: elasticsearch
+ role: master
+ ports:
+ - name: transport
+ port: 9300
+ protocol: TCP
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/es-master.yaml
----------------------------------------------------------------------
diff --git a/kubernetes/es-master.yaml b/kubernetes/es-master.yaml
new file mode 100644
index 0000000..38155f9
--- /dev/null
+++ b/kubernetes/es-master.yaml
@@ -0,0 +1,61 @@
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+ name: es-master
+ labels:
+ component: elasticsearch
+ role: master
+spec:
+ replicas: 2
+ template:
+ metadata:
+ labels:
+ component: elasticsearch
+ role: master
+ spec:
+ initContainers:
+ - name: init-sysctl
+ image: busybox:1.27.2
+ command:
+ - sysctl
+ - -w
+ - vm.max_map_count=262144
+ securityContext:
+ privileged: true
+ containers:
+ - name: es-master
+ image: senssoft/elasticsearch:latest
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+ - name: NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ - name: NODE_MASTER
+ value: "true"
+ - name: NODE_INGEST
+ value: "false"
+ - name: DISCOVERY_SERVICE
+ value: "elasticsearch-discovery"
+ - name: NODE_DATA
+ value: "false"
+ - name: HTTP_ENABLE
+ value: "false"
+ - name: ES_JAVA_OPTS
+ value: -Xms256m -Xmx256m
+ ports:
+ - containerPort: 9300
+ name: transport
+ livenessProbe:
+ tcpSocket:
+ port: transport
+ volumeMounts:
+ - name: storage
+ mountPath: /data
+ volumes:
+ - emptyDir:
+ medium: ""
+ name: "storage"
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/es-svc.yaml
----------------------------------------------------------------------
diff --git a/kubernetes/es-svc.yaml b/kubernetes/es-svc.yaml
new file mode 100644
index 0000000..8236b1c
--- /dev/null
+++ b/kubernetes/es-svc.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: elasticsearch
+ labels:
+ component: elasticsearch
+ role: client
+spec:
+ selector:
+ component: elasticsearch
+ role: client
+ ports:
+ - name: http
+ port: 9200
+ protocol: TCP
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/kibana-svc.yaml
----------------------------------------------------------------------
diff --git a/kubernetes/kibana-svc.yaml b/kubernetes/kibana-svc.yaml
new file mode 100644
index 0000000..e60e262
--- /dev/null
+++ b/kubernetes/kibana-svc.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: kibana
+ labels:
+ component: kibana
+spec:
+ selector:
+ component: kibana
+ ports:
+ - name: http
+ port: 80
+ targetPort: http
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/kibana.yaml
----------------------------------------------------------------------
diff --git a/kubernetes/kibana.yaml b/kubernetes/kibana.yaml
new file mode 100644
index 0000000..7d9366d
--- /dev/null
+++ b/kubernetes/kibana.yaml
@@ -0,0 +1,32 @@
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+ name: kibana
+ labels:
+ component: kibana
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ component: kibana
+ template:
+ metadata:
+ labels:
+ component: kibana
+ spec:
+ containers:
+ - name: kibana
+ image: docker.elastic.co/kibana/kibana:5.6.3
+ env:
+ - name: CLUSTER_NAME
+ value: SensSoft
+ - name: SERVER_BASEPATH
+ value: /api/v1/proxy/namespaces/default/services/kibana
+ resources:
+ limits:
+ cpu: 1000m
+ requests:
+ cpu: 100m
+ ports:
+ - containerPort: 5601
+ name: http
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/minikube_start.sh
----------------------------------------------------------------------
diff --git a/kubernetes/minikube_start.sh b/kubernetes/minikube_start.sh
new file mode 100755
index 0000000..bb3c364
--- /dev/null
+++ b/kubernetes/minikube_start.sh
@@ -0,0 +1 @@
+minikube start --vm-driver=hyperkit
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/minikube_stop.sh
----------------------------------------------------------------------
diff --git a/kubernetes/minikube_stop.sh b/kubernetes/minikube_stop.sh
new file mode 100755
index 0000000..ae5eba2
--- /dev/null
+++ b/kubernetes/minikube_stop.sh
@@ -0,0 +1,3 @@
+minikube stop
+eval $(minikube docker-env -u)
+# minikube delete
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/1196d061/kubernetes/status.sh
----------------------------------------------------------------------
diff --git a/kubernetes/status.sh b/kubernetes/status.sh
new file mode 100755
index 0000000..47f3b87
--- /dev/null
+++ b/kubernetes/status.sh
@@ -0,0 +1 @@
+kubectl get svc,deployment,pods -l component=elasticsearch
\ No newline at end of file
[3/3] incubator-senssoft git commit: Merge branch 'master' into master
Posted by ms...@apache.org.
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 B <mi...@gmail.com>
Authored: Mon Feb 12 09:34:25 2018 -0500
Committer: GitHub <no...@github.com>
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(-)
----------------------------------------------------------------------