Merge branch 'opensearch-project:main' into nodejs_check

Author: sipopo

.github/workflows/build_and_test_workflow.yml

@@ -7,8 +7,12 @@ name: Build and test
 on:
   push:
     branches: [ '**', '!feature/**', '!backport/**' ]
+    paths-ignore:
+      - '**/*.md'
   pull_request:
     branches: [ '**', '!feature/**' ]
+    paths-ignore:
+      - '**/*.md'
 
 env:
   TEST_BROWSER_HEADLESS: 1
@@ -182,7 +186,7 @@ jobs:
         working-directory: ./artifacts
     strategy: 
       matrix:
-        version: [ osd-2.0.0, osd-2.1.0 ]
+        version: [ osd-2.0.0, osd-2.1.0, osd-2.2.0 ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

bwctest.sh

@@ -13,7 +13,7 @@
 
 set -e
 
-DEFAULT_VERSIONS="osd-2.0.0,osd-2.1.0"
+DEFAULT_VERSIONS="osd-2.0.0,osd-2.1.0,osd-2.2.0"
 
 function usage() {
     echo ""

config/opensearch_dashboards.yml

@@ -40,7 +40,10 @@
 # This node attribute should assign all nodes of the same cluster an integer value that increments with each new cluster that is spun up
 # e.g. in opensearch.yml file you would set the value to a setting using node.attr.cluster_id:
 # Should only be enabled if there is a corresponding node attribute created in your OpenSearch config that matches the value here
-#opensearch.optimizedHealthcheckId: "cluster_id"
+#opensearch.optimizedHealthcheck.id: "cluster_id"
+#opensearch.optimizedHealthcheck.filters: {
+#  attribute_key: "attribute_value",
+#}
 
 # If your OpenSearch is protected with basic authentication, these settings provide
 # the username and password that the OpenSearch Dashboards server uses to perform maintenance on the OpenSearch Dashboards

cypress/test-data/with-security/osd-2.2.0.tar.gz

@@ -457,4 +457,4 @@
     "node": "14.20.0",
     "yarn": "^1.21.1"
   }
-}
+}

cypress/test-data/without-security/osd-2.2.0.tar.gz

@@ -26,19 +26,20 @@
     "dedent": "^0.7.0",
     "del": "^5.1.0",
     "execa": "^4.0.2",
+    "fibers": "^5.0.3",
     "file-loader": "^4.2.0",
     "jest-diff": "^27.5.1",
     "js-yaml": "^3.14.0",
     "json-stable-stringify": "^1.0.1",
     "lmdb-store": "^1.6.11",
     "loader-utils": "^1.2.3",
-    "node-sass": "^6.0.1",
     "normalize-path": "^3.0.0",
     "pirates": "^4.0.1",
     "postcss": "^8.4.5",
     "postcss-loader": "^4.2.0",
     "raw-loader": "^4.0.2",
     "rxjs": "^6.5.5",
+    "sass": "~1.26.11",
     "sass-loader": "^10.2.0",
     "source-map-support": "^0.5.19",
     "style-loader": "^1.1.3",

package.json

@@ -176,11 +176,12 @@ export function getWebpackConfig(bundle: Bundle, bundleRefs: BundleRefs, worker:
                       )};\n${content}`;
                     },
                     webpackImporter: false,
-                    implementation: require('node-sass'),
+                    implementation: require('sass'),
                     sassOptions: {
-                      outputStyle: 'nested',
+                      outputStyle: 'compressed',
                       includePaths: [Path.resolve(worker.repoRoot, 'node_modules')],
                       sourceMapRoot: `/${bundle.type}:${bundle.id}`,
+                      fiber: require('fibers'),
                     },
                   },
                 },

packages/osd-optimizer/package.json

@@ -28,7 +28,7 @@
  * under the License.
  */
 
-const sass = require('node-sass');
+const sass = require('sass');
 const postcss = require('postcss');
 const postcssConfig = require('@osd/optimizer/postcss.config.js');