Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sql, reporting, observability, gantt chart for 1.2 #888

Conversation

joshuali925
Copy link
Member

Description

  • add sql, reporting, observability (in trace-analytics repo), and gantt-chart
  • remove duplicated schema-version: '1.0'

Issues Resolved

[List any issues this PR will resolve]

Check List

  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@codecov-commenter
Copy link

codecov-commenter commented Nov 4, 2021

Codecov Report

Merging #888 (defe4d0) into main (241cbb8) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #888   +/-   ##
=======================================
  Coverage   91.58%   91.58%           
=======================================
  Files          87       87           
  Lines        2294     2294           
=======================================
  Hits         2101     2101           
  Misses        193      193           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 241cbb8...defe4d0. Read the comment docs.

@dblock
Copy link
Member

dblock commented Nov 5, 2021

I'm fixing CI for the 1.1.0 manifest in #890

@joshuali925 joshuali925 force-pushed the update-search-and-observability-plugins branch from 23a97a3 to a186cb6 Compare November 5, 2021 20:23
Comment on lines +80 to +98
- name: opensearch-observability
repository: https://github.com/opensearch-project/trace-analytics.git
ref: "main"
working_directory: "opensearch-observability"
checks:
- gradle:properties:version
- gradle:dependencies:opensearch.version
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we have new plugin. Adding @peternied as he is looking over 1.2 release.

Copy link
Member

@peternied peternied Nov 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for watching out for this, the repo for trace analytics is being tracked with opensearch-project/observability#118. To what is included or not is up to the repo to manage as they are onboard the release process 👍 .

@gaiksaya gaiksaya requested a review from peternied November 5, 2021 20:53
@kavilla
Copy link
Member

kavilla commented Nov 6, 2021

Unfortunately since this is a new(ish) plugin and it's in a "hybrid" repo it can't use the default script for building OpenSearch Dashboards plugins. Could you add a observabilityDashboards/build.sh to here https://github.com/opensearch-project/opensearch-build/tree/main/scripts/components. With the build.sh being:

#!/bin/bash

# SPDX-License-Identifier: Apache-2.0
#
# The OpenSearch Contributors require contributions made to
# this file be licensed under the Apache-2.0 license or a
# compatible open source license.

set -ex

function usage() {
    echo "Usage: $0 [args]"
    echo ""
    echo "Arguments:"
    echo -e "-v VERSION\t[Required] OpenSearch version."
    echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'."
    echo -e "-p PLATFORM\t[Optional] Platform, ignored."
    echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored."
    echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'."
    echo -e "-h help"
}

while getopts ":h:v:s:o:p:a:" arg; do
    case $arg in
        h)
            usage
            exit 1
            ;;
        v)
            VERSION=$OPTARG
            ;;
        s)
            SNAPSHOT=$OPTARG
            ;;
        o)
            OUTPUT=$OPTARG
            ;;
        p)
            PLATFORM=$OPTARG
            ;;
        a)
            ARCHITECTURE=$OPTARG
            ;;
        :)
            echo "Error: -${OPTARG} requires an argument"
            usage
            exit 1
            ;;
        ?)
            echo "Invalid option: -${arg}"
            exit 1
            ;;
    esac
done

if [ -z "$VERSION" ]; then
    echo "Error: You must specify the OpenSearch Dashboards version"
    usage
    exit 1
fi

[ -z "$OUTPUT" ] && OUTPUT=artifacts

mkdir -p $OUTPUT/plugins
# For hybrid plugin it actually resides in 'trace-analytics/dashboards-observability'
PLUGIN_FOLDER=$(basename "$PWD")
PLUGIN_NAME=$(basename $(dirname "$PWD"))
# TODO: [CLEANUP] Needed OpenSearch Dashboards git repo to build the required modules for plugins
# This makes it so there is a dependency on having Dashboards pulled already.
cp -r ../$PLUGIN_FOLDER/ ../../OpenSearch-Dashboards/plugins
echo "BUILD MODULES FOR $PLUGIN_NAME"
(cd ../../OpenSearch-Dashboards && yarn osd bootstrap)
echo "BUILD RELEASE ZIP FOR $PLUGIN_NAME"
(cd ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER && yarn plugin_helpers build)
echo "COPY $PLUGIN_NAME.zip"
cp -r ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER/build/$PLUGIN_NAME-$VERSION.zip $OUTPUT/plugins/
rm -rf ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER

After adding that file, I was able to build it. But, I can do it for you if you don't mind me committing on top of your branch.

Will need someone from OpenSearch to verify the build since I'm having issues with kNN locally.

Copy link
Member

@kavilla kavilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a new build script added for the new component.

@joshuali925 joshuali925 force-pushed the update-search-and-observability-plugins branch from a186cb6 to 8b697a5 Compare November 8, 2021 17:02
@joshuali925 joshuali925 requested a review from a team as a code owner November 8, 2021 17:02
@joshuali925 joshuali925 requested a review from kavilla November 8, 2021 17:03
manifests/1.2.0/opensearch-1.2.0.yml Outdated Show resolved Hide resolved
@joshuali925 joshuali925 requested a review from dblock November 8, 2021 17:28
Copy link
Contributor

@anirudha anirudha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@anirudha
Copy link
Contributor

anirudha commented Nov 8, 2021

@dblock @kavilla could you please review and approve , thanks

@joshuali925 joshuali925 force-pushed the update-search-and-observability-plugins branch from defe4d0 to 3cd6cd3 Compare November 8, 2021 17:47
@dblock dblock requested a review from gaiksaya November 8, 2021 18:03
Copy link
Member

@kavilla kavilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me on Dashboards side.

@dblock dblock merged commit 4126e54 into opensearch-project:main Nov 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants