Skip to content

Commit

Permalink
[Cleanup] final pass reference fixes and package version update (#216)
Browse files Browse the repository at this point in the history
* [Cleanup] final pass reference fixes and package version update

Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>

* Address PR comments

Signed-off-by: Bishoy Boktor <boktorbb@amazon.com>
  • Loading branch information
boktorbb authored Mar 22, 2021
1 parent 4670f18 commit 425c1d4
Show file tree
Hide file tree
Showing 23 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ We officially began work on the new fork on January 21st, 2021. Since then, we'v

### Look for the label "help wanted"

If you're excited to jump in, we've tried to mark a few issues that would be good candidates to get started on. Look for the label "help wanted" to find them. https://github.com/opensearch-project/OpenSearch/labels/help%20wanted
If you're excited to jump in, we've tried to mark a few issues that would be good candidates to get started on. Look for the label "help wanted" to find them. https://github.com/opensearch-project/OpenSearch-Dashboards/labels/help%20wanted

### Watch the forum, there are a bunch of things we want to talk about

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opensearch-dashboards",
"description": "OpenSearch Dashboards is a browser based analytics and search dashboard for OpenSearch. OpeenSearch Dashboards is a snap to setup and start using. OpeenSearch Dashboards strives to be easy to get started with, while also being flexible and powerful, just like OpenSearch.",
"description": "OpenSearch Dashboards is a browser based analytics and search dashboard for OpenSearch. OpenSearch Dashboards is a snap to setup and start using. OpenSearch Dashboards strives to be easy to get started with, while also being flexible and powerful, just like OpenSearch.",
"keywords": [
"opensearch-dashboards",
"opensearch",
Expand All @@ -11,7 +11,7 @@
"dashboarding"
],
"private": true,
"version": "7.10.3",
"version": "7.10.2",
"branch": "7.10",
"types": "./opensearch_dashboards.d.ts",
"tsdocMetadata": "./build/tsdoc-metadata.json",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ const { TextHighlightRules } = ace.acequire('ace/mode/text_highlight_rules');
const oop = ace.acequire('ace/lib/oop');

export const OpenSearchSqlHighlightRules = function (this: any) {
// See https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-commands.html
// See https://www.opensearch.co/guide/en/elasticsearch/reference/current/sql-commands.html
const keywords =
'describe|between|in|like|not|and|or|desc|select|from|where|having|group|by|order' +
'asc|desc|pivot|for|in|as|show|columns|include|frozen|tables|escape|limit|rlike|all|distinct|is';

const builtinConstants = 'true|false';

// See https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-syntax-show-functions.html
// See https://www.opensearch.co/guide/en/elasticsearch/reference/current/sql-syntax-show-functions.html
const builtinFunctions =
'avg|count|first|first_value|last|last_value|max|min|sum|kurtosis|mad|percentile|percentile_rank|skewness' +
'|stddev_pop|sum_of_squares|var_pop|histogram|case|coalesce|greatest|ifnull|iif|isnull|least|nullif|nvl' +
Expand All @@ -43,7 +43,7 @@ export const OpenSearchSqlHighlightRules = function (this: any) {
'|ltrim|octet_length|position|repeat|replace|right|rtrim|space|substring|ucase|cast|convert|database|user|st_astext|st_aswkt' +
'|st_distance|st_geometrytype|st_geomfromtext|st_wkttosql|st_x|st_y|st_z|score';

// See https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-data-types.html
// See https://www.opensearch.co/guide/en/elasticsearch/reference/current/sql-data-types.html
const dataTypes =
'null|boolean|byte|short|integer|long|double|float|half_float|scaled_float|keyword|text|binary|date|ip|object|nested|time' +
'|interval_year|interval_month|interval_day|interval_hour|interval_minute|interval_second|interval_year_to_month' +
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-babel-preset/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @osd/babel-preset

This package contains the shared bits of babel config that we use for transpiling our source code to code compatible with Node.JS and the various [browsers we support](https://www.elastic.co/support/matrix#matrix_browsers).
This package contains the shared bits of babel config that we use for transpiling our source code to code compatible with Node.JS and the various [browsers we support](https://www.opensearch.co/support/matrix#matrix_browsers).

## usage

Expand Down
1 change: 0 additions & 1 deletion packages/osd-config/src/env.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ test('correctly creates environment with constructor.', () => {
expect(env).toMatchSnapshot('env properties');
});


test('pluginSearchPaths contains examples plugins path if --run-examples flag is true', () => {
const env = new Env(
'/some/home/dir',
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-dev-utils/certs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The password used for both of these is "storepass". Other copies are also provid

## Certificate generation

[OpenSearch cert-util](https://www.elastic.co/guide/en/elasticsearch/reference/current/certutil.html) and [OpenSSL](https://www.openssl.org/) were used to generate these certificates. The following commands were used from the root directory of OpenSearch:
[OpenSearch cert-util](https://www.opensearch.co/guide/en/elasticsearch/reference/current/certutil.html) and [OpenSSL](https://www.openssl.org/) were used to generate these certificates. The following commands were used from the root directory of OpenSearch:

```
# Generate the PKCS #12 keystore for a CA, valid for 50 years
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-logging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ is still in `core` for now.
- [Log level](#log-level)
- [Layouts](#layouts)

The way logging works in OpenSearch Dashboards is inspired by `log4j 2` logging framework used by [Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html#logging).
The way logging works in OpenSearch Dashboards is inspired by `log4j 2` logging framework used by [Elasticsearch](https://www.opensearch.co/guide/en/elasticsearch/reference/current/settings.html#logging).
The main idea is to have consistent logging behaviour (configuration, log format etc.) across the entire Elastic Stack
where possible.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
"_cluster/health",
"_cluster/health/{indices}"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html"
"documentation": "https://www.opensearch.co/guide/en/elasticsearch/reference/master/cluster-health.html"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"cluster.health":{
"documentation":{
"url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html",
"url":"https://www.opensearch.co/guide/en/elasticsearch/reference/master/cluster-health.html",
"description":"Returns basic information about the health of the cluster."
},
"stability":"stable",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<![CDATA[]]>
</system-out>
<failure>
<![CDATA[Error: Unable to read artifact info from https://artifacts-api.elastic.co/v1/versions/8.0.0-SNAPSHOT/builds/latest/projects/elasticsearch: Service Temporarily Unavailable
<![CDATA[Error: Unable to read artifact info from https://artifacts-api.opensearch.co/v1/versions/8.0.0-SNAPSHOT/builds/latest/projects/elasticsearch: Service Temporarily Unavailable
<html>
<head><title>503 Service Temporarily Unavailable</title></head>
<body bgcolor="white">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@ it('rewrites mocha reports with minimal changes', async () => {
+
‹/system-out›
- ‹failure›
- ‹![CDATA[Error: Unable to read artifact info from https://artifacts-api.elastic.co/v1/versions/8.0.0-SNAPSHOT/builds/latest/projects/elasticsearch: Service Temporarily Unavailable
- ‹![CDATA[Error: Unable to read artifact info from https://artifacts-api.opensearch.co/v1/versions/8.0.0-SNAPSHOT/builds/latest/projects/elasticsearch: Service Temporarily Unavailable
+ ‹failure›‹![CDATA[
+ Error: Unable to read artifact info from https://artifacts-api.elastic.co/v1/versions/8.0.0-SNAPSHOT/builds/latest/projects/elasticsearch: Service Temporarily Unavailable
+ Error: Unable to read artifact info from https://artifacts-api.opensearch.co/v1/versions/8.0.0-SNAPSHOT/builds/latest/projects/elasticsearch: Service Temporarily Unavailable
‹html›
‹head›‹title›503 Service Temporarily Unavailable‹/title›‹/head›
‹body bgcolor="white"›
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ it('discovers failures in mocha report', async () => {
Object {
"classname": "X-Pack Mocha Tests.x-pack/legacy/plugins/code/server/__tests__/multi_node·ts",
"failure": "
Error: Unable to read artifact info from https://artifacts-api.elastic.co/v1/versions/8.0.0-SNAPSHOT/builds/latest/projects/elasticsearch: Service Temporarily Unavailable
Error: Unable to read artifact info from https://artifacts-api.opensearch.co/v1/versions/8.0.0-SNAPSHOT/builds/latest/projects/elasticsearch: Service Temporarily Unavailable
<html>
<head><title>503 Service Temporarily Unavailable</title></head>
<body bgcolor=\\"white\\">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export class GuideNav extends Component {
<span className="guideNav__version">{this.props.version}</span>
</Link>
<a
href="http://elastic.co"
href="http://opensearch.co"
className="guideNav__elasticLogo"
aria-label="Go to the Elastic website"
/>
Expand Down
2 changes: 1 addition & 1 deletion src/core/server/saved_objects/migrations/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ If a plugin is disbled, all of its documents are retained in the OpenSearch Dash
OpenSearch Dashboards index migrations expose a few config settings which might be tweaked:

- `migrations.scrollDuration` - The
[scroll](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-scroll.html#scroll-search-context)
[scroll](https://www.opensearch.co/guide/en/elasticsearch/reference/current/search-request-scroll.html#scroll-search-context)
value used to read batches of documents from the source index. Defaults to
`15m`.
- `migrations.batchSize` - The number of documents to read / transform / write
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ COPY --from=builder --chown=1000:0 /usr/share/kibana /usr/share/kibana
WORKDIR /usr/share/kibana
RUN ln -s /usr/share/kibana /opt/kibana

ENV ELASTIC_CONTAINER true
ENV OPENSEARCH_CONTAINER true
ENV PATH=/usr/share/kibana/bin:$PATH

# Set some Kibana configuration defaults.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ <h2 i18n-id="timeline.help.queryingTitle" i18n-default-message="Querying the Ope
timeline.help.querying.paragraph2Part1 +
timeline.help.querying.luceneQueryLinkText +
timeline.help.querying.paragraph2Part2"></span>
<a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax"
<a href="https://www.opensearch.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax"
target="_blank" rel="noopener noreferrer" i18n-id="timeline.help.querying.luceneQueryLinkText"
i18n-default-message="Lucene query string" i18n-description="Part of composite text
timeline.help.querying.paragraph2Part1 +
Expand Down Expand Up @@ -221,7 +221,7 @@ <h4 i18n-id="timeline.help.querying.countTitle" i18n-default-message="Beyond cou
timeline.help.querying.countTextPart1 +
timeline.help.querying.countMetricAggregationLinkText +
timeline.help.querying.countTextPart2"></span>
<a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics.html"
<a href="https://www.opensearch.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics.html"
target="_blank" rel="noopener noreferrer" i18n-id="timeline.help.querying.countMetricAggregationLinkText"
i18n-default-message="OpenSearch metric aggregation" i18n-description="Part of composite text
timeline.help.querying.countTextPart1 +
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/vis_type_vega/public/data_model/vega_parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ The URL is an identifier only. OpenSearch Dashboards and your browser will never
* @private
*/
_setDefaultColors() {
// Default category coloring to the Elastic color scheme
// Default category coloring to the OpenSearch color scheme
this._setDefaultValue({ scheme: 'elastic' }, 'config', 'range', 'category');

if (this.isVegaLite) {
Expand Down
3 changes: 2 additions & 1 deletion tasks/licenses_csv_report.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ export default function licensesCSVReport(grunt) {
licenses: [
'Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf',
],
sourceURL: 'https://oss-dependencies.elastic.co/redhat/ubi/ubi-minimal-8-source.tar.gz',
sourceURL:
'https://oss-dependencies.opensearch.co/redhat/ubi/ubi-minimal-8-source.tar.gz',
}
);

Expand Down
4 changes: 2 additions & 2 deletions test/common/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ export default function () {
// '--telemetry.banner=false',
// '--telemetry.optIn=false',
// These are *very* important to have them pointing to staging
// '--telemetry.url=https://telemetry-staging.elastic.co/xpack/v2/send',
// '--telemetry.optInStatusUrl=https://telemetry-staging.elastic.co/opt_in_status/v2/send',
// '--telemetry.url=https://telemetry-staging.opensearch.co/xpack/v2/send',
// '--telemetry.optInStatusUrl=https://telemetry-staging.opensearch.co/opt_in_status/v2/send',
`--server.maxPayloadBytes=1679958`,
// newsfeed mock service
// `--plugin-path=${path.join(__dirname, 'fixtures', 'plugins', 'newsfeed')}`,
Expand Down
6 changes: 3 additions & 3 deletions test/common/fixtures/plugins/newsfeed/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export class NewsFeedSimulatorPlugin implements Plugin {
title: { en: `You are functionally testing the newsfeed widget with fixtures!` },
description: { en: 'See test/common/fixtures/plugins/newsfeed/newsfeed_simulation' },
link_text: { en: 'Generic feed-viewer could go here' },
link_url: { en: 'https://feeds.elastic.co' },
link_url: { en: 'https://feeds.opensearch.co' },
languages: null,
badge: null,
image_url: null,
Expand All @@ -71,7 +71,7 @@ export class NewsFeedSimulatorPlugin implements Plugin {
title: { en: 'Staging too!' },
description: { en: 'Hello world' },
link_text: { en: 'Generic feed-viewer could go here' },
link_url: { en: 'https://feeds-staging.elastic.co' },
link_url: { en: 'https://feeds-staging.opensearch.co' },
languages: null,
badge: null,
image_url: null,
Expand All @@ -83,7 +83,7 @@ export class NewsFeedSimulatorPlugin implements Plugin {
title: { en: 'This item is expired!' },
description: { en: 'This should not show up.' },
link_text: { en: 'Generic feed-viewer could go here' },
link_url: { en: 'https://feeds-staging.elastic.co' },
link_url: { en: 'https://feeds-staging.opensearch.co' },
languages: null,
badge: null,
image_url: null,
Expand Down
6 changes: 3 additions & 3 deletions test/functional/apps/getting_started/_shakespeare.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }) {
'visChart',
]);

// https://www.elastic.co/guide/en/kibana/current/tutorial-load-dataset.html
// https://www.opensearch.co/guide/en/kibana/current/tutorial-load-dataset.html

describe('Shakespeare', function describeIndexTests() {
// index starts on the first "count" metric at 1
Expand All @@ -45,7 +45,7 @@ export default function ({ getService, getPageObjects }) {
before(async function () {
log.debug(
'Load empty_opensearch_dashboards and Shakespeare Getting Started data\n' +
'https://www.elastic.co/guide/en/kibana/current/tutorial-load-dataset.html'
'https://www.opensearch.co/guide/en/kibana/current/tutorial-load-dataset.html'
);
await security.testUser.setRoles(['opensearch_dashboards_admin', 'test_shakespeare_reader']);
await opensearchArchiver.load('empty_opensearch_dashboards', { skipExisting: true });
Expand All @@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }) {
expect(patternName).to.be('shakespeare');
});

// https://www.elastic.co/guide/en/kibana/current/tutorial-visualizing.html
// https://www.opensearch.co/guide/en/kibana/current/tutorial-visualizing.html
/* 1. Click New and select Vertical bar chart.
2. Select the shakes* index pattern. Since you haven’t defined any buckets
yet, you’ll see a single big bar that shows the total count of documents that
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/getting_started/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function ({ getService, loadTestFile }) {
before(async function () {
await browser.setWindowSize(1200, 800);
});
// https://www.elastic.co/guide/en/kibana/current/tutorial-load-dataset.html
// https://www.opensearch.co/guide/en/kibana/current/tutorial-load-dataset.html
loadTestFile(require.resolve('./_shakespeare'));
});
}
2 changes: 1 addition & 1 deletion test/server_integration/__fixtures__/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ EE='localhost'

## Step 2. Generate PKCS12 key stores

Using [opensearch-certutil](https://www.elastic.co/guide/en/opensearch/reference/current/certutil.html):
Using [opensearch-certutil](https://www.opensearch.co/guide/en/opensearch/reference/current/certutil.html):

```sh
bin/opensearch-certutil ca --ca-dn "CN=Test Root CA" -days 18250 --out $CA1.p12 --pass castorepass
Expand Down

0 comments on commit 425c1d4

Please sign in to comment.