Revert "Manual master cherrypick into 2.x (#550)"

This reverts commit 423c599.

.ci/opendistro/Dockerfile.opendistro

@@ -0,0 +1,7 @@
+ARG OPENDISTRO_VERSION
+FROM amazon/opendistro-for-elasticsearch:${OPENDISTRO_VERSION}
+
+ARG es_path=/usr/share/elasticsearch
+
+ARG SECURE_INTEGRATION
+RUN if [ "$SECURE_INTEGRATION" != "true" ] ; then $es_path/bin/elasticsearch-plugin remove opendistro_security; fi

.ci/opendistro/docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3'
+
+services:
+  elasticsearch:
+    build:
+      context: .
+      dockerfile: Dockerfile.opendistro
+      args:
+        - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
+        - OPENDISTRO_VERSION=${OPENDISTRO_VERSION:-latest}
+    environment:
+      - discovery.type=single-node
+      - bootstrap.memory_lock=true
+    ports:
+      - '9200:9200'
+    user: elasticsearch

.ci/opensearch/Dockerfile.opensearch

@@ -5,10 +5,4 @@ ARG opensearch_path=/usr/share/opensearch
 ARG opensearch_yml=$opensearch_path/config/opensearch.yml
 
 ARG SECURE_INTEGRATION
-
-HEALTHCHECK --start-period=20s --interval=5s --retries=2 --timeout=1s \
-  CMD if [ "$SECURE_INTEGRATION" != "true" ]; \
-  then curl --fail localhost:9200/_cat/health; \
-  else curl --fail -k https:/localhost:9200/_cat/health -u admin:admin; fi
-
 RUN if [ "$SECURE_INTEGRATION" != "true" ] ; then $opensearch_path/bin/opensearch-plugin remove opensearch-security; fi

.ci/opensearch/docker-compose.yml

@@ -2,7 +2,6 @@ version: '3'
 
 services:
   opensearch:
-    restart: always
     build:
       context: .
       dockerfile: Dockerfile.opensearch
@@ -12,17 +11,6 @@ services:
     environment:
       - discovery.type=single-node
       - bootstrap.memory_lock=true
-      - SECURE_INTEGRATION=${SECURE_INTEGRATION:-false}
     ports:
       - '9200:9200'
     user: opensearch
-  autoheal:
-    restart: always
-    image: willfarrell/autoheal
-    environment:
-      - AUTOHEAL_CONTAINER_LABEL=all
-      - AUTOHEAL_START_PERIOD=30
-      - AUTOHEAL_INTERVAL=5
-      - AUTOHEAL_DEFAULT_STOP_TIMEOUT=30
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock

.eslintrc.json

@@ -7,10 +7,7 @@
         "eslint:recommended",
         "prettier"
     ],
-    "parser": "@babel/eslint-parser",
-    "parserOptions": {
-        "requireConfigFile": false
-    },
+    "parser": "babel-eslint",
     "plugins": [
         "prettier"
     ],
@@ -21,14 +18,9 @@
                 "endOfLine": "auto"
             }
         ],
+        /*temporarily turn off no-unused-vars, open an issue to track https://github.com/opensearch-project/opensearch-js/issues/241*/
+        "no-unused-vars": "off",
         /*temporarily turn off no-dupe-else-if, open an issue to track https://github.com/opensearch-project/opensearch-js/issues/240*/
-        "no-dupe-else-if": "off",
-        "no-unused-vars": [
-            "error",
-            {
-                "varsIgnorePattern": "^_.*",
-                "argsIgnorePattern": "^_.*"
-            }
-        ]
+        "no-dupe-else-if": "off"
     }
-}
+}

.github/workflows/release-drafter.yml

@@ -27,4 +27,4 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           draft: true
-          generate_release_notes: true
+          generate_release_notes: true

.gitignore

@@ -53,12 +53,6 @@ opensearch*
 !opensearch_dashboards*
 !opensearchDashboards*
 
-# documentation
-docs/
-
-# temporary
-tmp/
-
 test/benchmarks/macro/fixtures/*
 
 *-junit.xml