[elasticsearch][kibana] remove oss examples (#1046) (#1052)

elastic · Feb 16, 2021 · a2c1324 · a2c1324
1 parent 2a6af4c
commit a2c1324
Show file tree

Hide file tree

Showing 26 changed files with 123 additions and 181 deletions.
diff --git a/apm-server/README.md b/apm-server/README.md
@@ -138,7 +138,7 @@ An example can be found in [examples/security][].
 
 ### How to install OSS version of APM Server?
 
-Deploying OSS version of Elasticsearch can be done by setting `image` value to
+Deploying OSS version of APM Server can be done by setting `image` value to
 [APM Server OSS Docker image][]
 
 An example of APM Server deployment using OSS version can be found in

diff --git a/apm-server/examples/oss/README.md b/apm-server/examples/oss/README.md
@@ -12,7 +12,7 @@ This example deploy APM Server 7.11.0-SNAPSHOT using [APM Server OSS][] version.
 * You can now setup a port forward to query APM indices:
 
   ```
-  kubectl port-forward svc/oss-master 9200
+  kubectl port-forward svc/elasticsearch-master 9200
   curl localhost:9200/_cat/indices
   ```
 
@@ -23,5 +23,5 @@ You can also run [goss integration tests][] using `make test`
 
 
 [apm server oss]: https://www.elastic.co/downloads/apm-oss
-[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/oss/
+[elasticsearch helm chart]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/default/
 [goss integration tests]: https://github.com/elastic/helm-charts/tree/7.x/apm-server/examples/oss/test/goss.yaml
diff --git a/apm-server/examples/oss/test/goss.yaml b/apm-server/examples/oss/test/goss.yaml
@@ -3,4 +3,9 @@ http:
     status: 200
     timeout: 2000
     body:
-      - "7.11.0"
+      - '7.11.0'
+  http://elasticsearch-master:9200/_cat/indices:
+    status: 200
+    timeout: 2000
+    body:
+      - 'apm-oss-7.11.0'
diff --git a/apm-server/examples/oss/values.yaml b/apm-server/examples/oss/values.yaml
@@ -10,12 +10,8 @@ apmConfig:
       enabled: false
 
     output.elasticsearch:
-      hosts: ["http://oss-master:9200"]
-      ## If you have security enabled- you'll need to add the credentials
-      ## as environment variables
-      # username: "${ELASTICSEARCH_USERNAME}"
-      # password: "${ELASTICSEARCH_PASSWORD}"
-      ## If SSL is enabled
-      # protocol: https
-      # ssl.certificate_authorities:
-      #  - /usr/share/apm-server/config/certs/elastic-ca.pem
+      hosts: ["http://elasticsearch-master:9200"]
+      index: "apm-oss-%{[observer.version]}-%{+yyyy.MM.dd}"
+
+    setup.template.name: "apm-server"
+    setup.template.pattern: "apm-oss-*"
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
@@ -26,7 +26,6 @@ This Helm chart is a lightweight way to configure and run our official
     - [Clustering and Node Discovery](#clustering-and-node-discovery)
   - [How to deploy clusters with security (authentication and TLS) enabled?](#how-to-deploy-clusters-with-security-authentication-and-tls-enabled)
   - [How to migrate from helm/charts stable chart?](#how-to-migrate-from-helmcharts-stable-chart)
-  - [How to install OSS version of Elasticsearch?](#how-to-install-oss-version-of-elasticsearch)
   - [How to install plugins?](#how-to-install-plugins)
   - [How to use the keystore?](#how-to-use-the-keystore)
     - [Basic example](#basic-example)
@@ -255,14 +254,6 @@ An example of Elasticsearch cluster using security can be found in
 If you currently have a cluster deployed with the [helm/charts stable][] chart
 you can follow the [migration guide][].
 
-### How to install OSS version of Elasticsearch?
-
-Deploying OSS version of Elasticsearch can be done by setting `image` value to
-[Elasticsearch OSS Docker image][]
-
-An example of Elasticsearch cluster using OSS version can be found in
-[examples/oss][].
-
 ### How to install plugins?
 
 The recommended way to install plugins into our Docker images is to create a
@@ -409,12 +400,10 @@ about our development and testing process.
 [docker for mac]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/docker-for-mac
 [elasticsearch cluster health status params]: https://www.elastic.co/guide/en/elasticsearch/reference/7.x/cluster-health.html#request-params
 [elasticsearch docker image]: https://www.elastic.co/guide/en/elasticsearch/reference/7.x/docker.html
-[elasticsearch oss docker image]: https://www.docker.elastic.co/r/elasticsearch/elasticsearch-oss
 [environment variables]: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config
 [environment from variables]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables
 [examples]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/
 [examples/multi]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/multi
-[examples/oss]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/oss
 [examples/security]: https://github.com/elastic/helm-charts/tree/7.x/elasticsearch/examples/security
 [gke]: https://cloud.google.com/kubernetes-engine
 [helm]: https://helm.sh

diff --git a/elasticsearch/examples/oss/Makefile b/elasticsearch/examples/oss/Makefile
diff --git a/elasticsearch/examples/oss/README.md b/elasticsearch/examples/oss/README.md
diff --git a/elasticsearch/examples/oss/test/goss.yaml b/elasticsearch/examples/oss/test/goss.yaml
diff --git a/elasticsearch/examples/oss/values.yaml b/elasticsearch/examples/oss/values.yaml
diff --git a/elasticsearch/tests/elasticsearch_test.py b/elasticsearch/tests/elasticsearch_test.py
@@ -1065,16 +1065,6 @@ def test_esMajorVersion_always_wins():
     assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "7"
 
 
-def test_esMajorVersion_parse_image_tag_for_oss_image():
-    config = """
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss
-    imageTag: 6.3.2
-    """
-
-    r = helm_template(config)
-    assert r["statefulset"][uname]["metadata"]["annotations"]["esMajorVersion"] == "6"
-
-
 def test_set_pod_security_context():
     config = ""
     r = helm_template(config)

diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
@@ -13,7 +13,7 @@ roles:
   ingest: "true"
   data: "true"
   remote_cluster_client: "true"
-# ml: "true" # ml is not availble with elasticsearch-oss
+  ml: "true"
 
 replicas: 3
 minimumMasterNodes: 2

diff --git a/filebeat/README.md b/filebeat/README.md
@@ -136,7 +136,7 @@ as a reference. They are also used in the automated testing of this chart.
 | `hostPathRoot`                 | Fully-qualified [hostPath][] that will be used to persist filebeat registry data                                                                                             | `/var/lib`                         |
 | `imagePullPolicy`              | The Kubernetes [imagePullPolicy][] value                                                                                                                                     | `IfNotPresent`                     |
 | `imagePullSecrets`             | Configuration for [imagePullSecrets][] so that you can use a private registry for your image                                                                                 | `[]`                               |
-| `imageTag`                     | The filebeat Docker image tag                                                                                                                                                | `8.0.0-SNAPSHOT`                   |
+| `imageTag`                     | The filebeat Docker image tag                                                                                                                                                | `7.11.0-SNAPSHOT`                   |
 | `image`                        | The filebeat Docker image                                                                                                                                                    | `docker.elastic.co/beats/filebeat` |
 | `livenessProbe`                | Parameters to pass to liveness [probe][] checks for values such as timeouts and thresholds                                                                                   | see [values.yaml][]                |
 | `managedServiceAccount`        | Whether the `serviceAccount` should be managed by this helm chart. Set this to `false` in order to manage your own service account and related roles                         | `true`                             |
@@ -179,7 +179,7 @@ An example can be found in [examples/security][].
 
 ### How to install OSS version of Filebeat?
 
-Deploying OSS version of Elasticsearch can be done by setting `image` value to
+Deploying OSS version of Filebeat can be done by setting `image` value to
 [Filebeat OSS Docker image][]
 
 An example of Filebeat deployment using OSS version can be found in

diff --git a/filebeat/examples/deployment/README.md b/filebeat/examples/deployment/README.md
@@ -1,6 +1,6 @@
 # Default
 
-This example deploy Filebeat 8.0.0-SNAPSHOT using [default values][] as a Kubernetes Deployment.
+This example deploy Filebeat 7.11.0-SNAPSHOT using [default values][] as a Kubernetes Deployment.
 
 
 ## Usage

diff --git a/filebeat/examples/oss/test/goss.yaml b/filebeat/examples/oss/test/goss.yaml
@@ -15,8 +15,8 @@ user:
     gid: 1000
 
 http:
-  http://oss-master:9200/_cat/indices:
+  http://elasticsearch-master:9200/_cat/indices:
     status: 200
     timeout: 2000
     body:
-      - "filebeat-7.11.0"
+      - "filebeat-oss-7.11.0"
diff --git a/filebeat/examples/oss/values.yaml b/filebeat/examples/oss/values.yaml
@@ -1,5 +1,22 @@
 image: docker.elastic.co/beats/filebeat-oss
 
-extraEnvs:
-  - name: ELASTICSEARCH_HOSTS
-    value: oss-master:9200
+daemonset:
+  filebeatConfig:
+    filebeat.yml: |
+      filebeat.inputs:
+      - type: container
+        paths:
+          - /var/log/containers/*.log
+        processors:
+        - add_kubernetes_metadata:
+            host: ${NODE_NAME}
+            matchers:
+            - logs_path:
+                logs_path: "/var/log/containers/"
+      output.elasticsearch:
+        host: '${NODE_NAME}'
+        hosts: "elasticsearch-master:9200"
+        index: "filebeat-oss-%{[agent.version]}-%{+yyyy.MM.dd}"
+      setup.ilm.enabled: false
+      setup.template.name: "filebeat"
+      setup.template.pattern: "filebeat-oss-*"
diff --git a/helpers/matrix.yml b/helpers/matrix.yml
@@ -9,12 +9,10 @@ ES_SUITE:
   - default
   - config
   - multi
-  - oss
   - security
   - upgrade
 KIBANA_SUITE:
   - default
-  - oss
   - security
   - upgrade
 FILEBEAT_SUITE:

diff --git a/kibana/README.md b/kibana/README.md
@@ -22,7 +22,6 @@ This Helm chart is a lightweight way to configure and run our official
 - [FAQ](#faq)
   - [How to deploy this chart on a specific K8S distribution?](#how-to-deploy-this-chart-on-a-specific-k8s-distribution)
   - [How to use Kibana with security (authentication and TLS) enabled?](#how-to-use-kibana-with-security-authentication-and-tls-enabled)
-  - [How to install OSS version of Kibana?](#how-to-install-oss-version-of-kibana)
   - [How to install plugins?](#how-to-install-plugins)
   - [How to import objects post-deployment?](#how-to-import-objects-post-deployment)
 - [Contributing](#contributing)
@@ -143,14 +142,6 @@ outside of this chart and accessed using [environment variables][] and volumes.
 
 An example can be found in [examples/security][].
 
-### How to install OSS version of Kibana?
-
-Deploying OSS version of Elasticsearch can be done by setting `image` value to
-[kibana OSS Docker image][]
-
-An example of Kibana deployment using OSS version can be found in
-[examples/oss][].
-
 ### How to install plugins?
 
 The recommended way to install plugins into our Docker images is to create a
@@ -215,7 +206,6 @@ about our development and testing process.
 [environment variables]: https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/#using-environment-variables-inside-of-your-config
 [environment from variables]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables
 [examples]: https://github.com/elastic/helm-charts/tree/7.x/kibana/examples
-[examples/oss]: https://github.com/elastic/helm-charts/tree/7.x/kibana/examples/oss
 [examples/security]: https://github.com/elastic/helm-charts/tree/7.x/kibana/examples/security
 [gke]: https://cloud.google.com/kubernetes-engine
 [helm]: https://helm.sh
@@ -224,7 +214,6 @@ about our development and testing process.
 [imagePullSecrets]: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/#create-a-pod-that-uses-your-secret
 [ingress]: https://kubernetes.io/docs/concepts/services-networking/ingress/
 [kibana docker image]: https://www.elastic.co/guide/en/kibana/7.x/docker.html
-[kibana oss docker image]: https://www.docker.elastic.co/r/kibana/kibana-oss
 [kubernetes secrets]: https://kubernetes.io/docs/concepts/configuration/secret/
 [labels]: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
 [lifecycle hooks]: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/

diff --git a/kibana/examples/oss/Makefile b/kibana/examples/oss/Makefile
diff --git a/kibana/examples/oss/README.md b/kibana/examples/oss/README.md
diff --git a/kibana/examples/oss/test/goss.yaml b/kibana/examples/oss/test/goss.yaml
diff --git a/kibana/examples/oss/values.yaml b/kibana/examples/oss/values.yaml
diff --git a/logstash/README.md b/logstash/README.md
@@ -158,7 +158,7 @@ useful for the [http input plugin][], for instance.
 
 ### How to install OSS version of Logstash?
 
-Deploying OSS version of Elasticsearch can be done by setting `image` value to
+Deploying OSS version of Logstash can be done by setting `image` value to
 [Logstash OSS Docker image][]
 
 An example of Logstash deployment using OSS version can be found in

diff --git a/metricbeat/README.md b/metricbeat/README.md
@@ -178,7 +178,7 @@ An example can be found in [examples/security][].
 
 ### How to install OSS version of Metricbeat?
 
-Deploying OSS version of Elasticsearch can be done by setting `image` value to
+Deploying OSS version of Metricbeat can be done by setting `image` value to
 [Metricbeat OSS Docker image][]
 
 An example of Metricbeat deployment using OSS version can be found in

diff --git a/metricbeat/examples/oss/test/goss-metrics.yaml b/metricbeat/examples/oss/test/goss-metrics.yaml
@@ -17,16 +17,16 @@ user:
     gid: 1000
 
 http:
-  http://oss-master:9200/_cat/indices:
+  http://elasticsearch-master:9200/_cat/indices:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-7.11.0'
-  http://oss-master:9200/_search?q=metricset.name:state_deployment:
+      - 'metricbeat-oss-7.11.0'
+  http://elasticsearch-master:9200/_search?q=metricset.name:state_deployment:
     status: 200
     timeout: 2000
     body:
-      - 'metricbeat-7.11.0'
+      - 'metricbeat-oss-7.11.0'
 
 file:
   /usr/share/metricbeat/metricbeat.yml:
@@ -38,5 +38,4 @@ command:
   cd /usr/share/metricbeat && metricbeat test output:
     exit-status: 0
     stdout:
-      - 'elasticsearch: http://oss-master:9200'
-      - 'version: 7.11.0'
+      - 'elasticsearch: http://elasticsearch-master:9200'