From 4b4b2817608c89d19ee7e4bd5625a92ae6fba1c6 Mon Sep 17 00:00:00 2001 From: YANGDB Date: Tue, 30 Jul 2024 17:45:36 -0700 Subject: [PATCH] update getting-started links to match recent catalog PR merges (#2012) * update links to match recent catalog PR merges * update wget command to create a local folder * update wget command to create a local folder --- .../csv_file/csv_file-1.0.0.json | 28 ++++++++-------- .../getting-started/{fluent-bit => }/.env | 0 .../{fluent-bit => }/docker-complete.yml | 10 +++--- .../{fluent-bit => }/fluent-bit.yml | 9 ++++-- .../fluent-bit/{data => }/fluent-bit.conf | 4 +-- .../fluent-bit/{data => }/logs.csv | 0 .../fluent-bit/{data => }/parsers.conf | 0 .../csv_file/getting-started/logs/logs.csv | 10 ++++++ .../opensearch_dashboards.yml | 0 .../csv_file/info/Getting-Started.md | 2 +- .../golang_client/golang_client-1.0.0.json | 30 ++++++++--------- .../java_client/java_client-1.0.0.json | 30 ++++++++--------- .../nginx/nginx-1.0.0.json | 32 +++++++++---------- .../otel-services/otel-services-1.0.0.json | 18 +++++------ .../python_client/python_client-1.0.0.json | 28 ++++++++-------- 15 files changed, 107 insertions(+), 94 deletions(-) rename public/components/getting_started/getting_started_artifacts/csv_file/getting-started/{fluent-bit => }/.env (100%) rename public/components/getting_started/getting_started_artifacts/csv_file/getting-started/{fluent-bit => }/docker-complete.yml (87%) rename public/components/getting_started/getting_started_artifacts/csv_file/getting-started/{fluent-bit => }/fluent-bit.yml (66%) rename public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/{data => }/fluent-bit.conf (88%) rename public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/{data => }/logs.csv (100%) rename public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/{data => }/parsers.conf (100%) create mode 100644 public/components/getting_started/getting_started_artifacts/csv_file/getting-started/logs/logs.csv rename public/components/getting_started/getting_started_artifacts/csv_file/getting-started/{fluent-bit => }/opensearch_dashboards.yml (100%) diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/csv_file-1.0.0.json b/public/components/getting_started/getting_started_artifacts/csv_file/csv_file-1.0.0.json index 11355ff03..e042ea7a8 100644 --- a/public/components/getting_started/getting_started_artifacts/csv_file/csv_file-1.0.0.json +++ b/public/components/getting_started/getting_started_artifacts/csv_file/csv_file-1.0.0.json @@ -7,7 +7,7 @@ "type": "logs", "labels": ["Logs", "Unstructured"], "author": "OpenSearch", - "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/csv_file/info", + "sourceUrl": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file", "workflows": [ { "name": "dashboards", @@ -40,7 +40,7 @@ }, "components": [], "getting-started": { - "info": "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/info/Getting-Started.md", + "info": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/getting-started/Getting-Started.md", "ingestion": ["fluent-bit","data-prepper"], "structured": "true", "technology": "csv", @@ -76,8 +76,8 @@ "type": "host-name" } ], - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/csv_file/getting-started/fluent-bit/.env"], - "content": "wget https://github.com/raw/opensearch-catalog/tree/main/integrations/csv_file/getting-started/fluent-bit/.env", + "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/getting-started/fluent-bit/.env"], + "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/fluent-bit/.env", "description": "Setup docker-compose env variables " }, { @@ -85,10 +85,10 @@ "label": "Environment Parameters", "phase": "docker", "type": "file-url", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/csv_file/getting-started/fluent-bit/data/fluent-bit.conf", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/csv_file/getting-started/fluent-bit/data/parsers.conf" + "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/getting-started/fluent-bit/fluent-bit.conf", + "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/getting-started/fluent-bit/parsers.conf" ], - "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/csv_file/getting-started/fluent-bit/data/fluent-bit.conf \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/fluent-bit/data/parsers.conf\n", + "content": "mkdir -p fluent-bit\nwget -P fluent-bit https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/fluent-bit/fluent-bit.conf \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/fluent-bit/parsers.conf\n", "description": "Setup docker-compose fluent-bit's service configuration " }, { @@ -96,9 +96,9 @@ "label": "live container", "type": "file-url", "phase": "docker", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/getting-started/fluent-bit.yml"], + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/getting-started/fluent-bit/fluent-bit.yml"], "description": "Run docker-compose for the nginx live example and see the generated index", - "content": "wget -O fluent-bit.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/fluent-bit.yml && docker-compose -f fluent-bit.yml up -d\n" + "content": "wget -O fluent-bit.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/csv_file/getting-started/fluent-bit/fluent-bit.yml && docker-compose -f fluent-bit.yml up -d\n" } ] }, @@ -111,7 +111,7 @@ "type": "console-cmd", "phase": "ingestion", "label": "Log Parsing", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/getting-started/fluent-bit/data/parsers.conf"], + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/getting-started/fluent-bit/parsers.conf"], "description": "Setup Fluent-Bit parser config file parsing csv file", "content": "[PARSER]\n Name csv\n Format regex\n Regex ^(?[^,]+),(?[^,]+),(?[^,]+),(?[^,]+),(?[^,]+)$\n Time_Key timestamp\n Time_Format %Y-%m-%d %H:%M:%S\n" }, @@ -120,7 +120,7 @@ "type": "console-cmd", "phase": "ingestion", "label": "Agent Set-Up", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/getting-started/fluent-bit/data/fluent-bit.conf"], + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/getting-started/fluent-bit/fluent-bit.conf"], "description": "Setup Fluent-Bit conf file including logs parsing and OpenSearch access", "input-params": [ { @@ -145,7 +145,7 @@ "info": ["https://opensearch.org/docs/latest/im-plugin/index-templates"], "content": "PUT _index_template/csv_logs_template", "description": "Setup sample csv based schema logs index template in the dev console", - "index-template": "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/schema/csv-logs-1.0.0.mapping.json", + "index-template": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/schema/csv-logs-1.0.0.mapping.json", "index-pattern-name": "logs-*" } ], @@ -153,7 +153,7 @@ "type": ["logs"], "info": ["https://opensearch.org/docs/latest/dashboards/management/index-patterns/"], "description": "Import index patterns `.ndjson` file to the saved objects", - "index-pattern": "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/csv_file/assets/fluent-bit-csv-upload-1.0.0.ndjson", + "index-pattern": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/csv_file/assets/fluent-bit-csv-upload-1.0.0.ndjson", "index-patterns-name": ["logs-*"] } }, @@ -163,4 +163,4 @@ "sampleData": { "path": "logs.csv" } -} \ No newline at end of file +} diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/.env b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/.env similarity index 100% rename from public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/.env rename to public/components/getting_started/getting_started_artifacts/csv_file/getting-started/.env diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/docker-complete.yml b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/docker-complete.yml similarity index 87% rename from public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/docker-complete.yml rename to public/components/getting_started/getting_started_artifacts/csv_file/getting-started/docker-complete.yml index 64d0525db..582f5f52d 100644 --- a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/docker-complete.yml +++ b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/docker-complete.yml @@ -40,13 +40,13 @@ services: - opensearch-net fluent-bit: - image: fluent/fluent-bit:latest container_name: fluent-bit volumes: - - ./data:/fluent-bit/data - command: ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/data/fluent-bit.conf"] - depends_on: - - opensearch-node1 + - ./logs:/logs + - ./fluent-bit:/fluent-bit/etc + ports: + - "24224:24224" + - "24224:24224/udp" networks: - opensearch-net diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/fluent-bit.yml b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit.yml similarity index 66% rename from public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/fluent-bit.yml rename to public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit.yml index 1897c8b4a..16f95f8b3 100644 --- a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/fluent-bit.yml +++ b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit.yml @@ -2,11 +2,14 @@ version: '3.8' services: fluent-bit: - image: fluent/fluent-bit:latest container_name: fluent-bit + image: fluent/fluent-bit:latest volumes: - - ./data:/fluent-bit/data - command: ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/data/fluent-bit.conf"] + - ./logs:/logs + - ./fluent-bit:/fluent-bit/etc + ports: + - "24224:24224" + - "24224:24224/udp" networks: - opensearch-net diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/data/fluent-bit.conf b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/fluent-bit.conf similarity index 88% rename from public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/data/fluent-bit.conf rename to public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/fluent-bit.conf index 5be828ada..9a23d90c7 100644 --- a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/data/fluent-bit.conf +++ b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/fluent-bit.conf @@ -5,7 +5,7 @@ [INPUT] Name tail - Path /fluent-bit/data/*.csv + Path *.csv Parser csv Tag csv @@ -25,4 +25,4 @@ tls.verify Off Suppress_Type_Name On HTTP_User admin - HTTP_Passwd my_%New%_passW0rd!@# \ No newline at end of file + HTTP_Passwd my_%New%_passW0rd!@# diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/data/logs.csv b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/logs.csv similarity index 100% rename from public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/data/logs.csv rename to public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/logs.csv diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/data/parsers.conf b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/parsers.conf similarity index 100% rename from public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/data/parsers.conf rename to public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/parsers.conf diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/logs/logs.csv b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/logs/logs.csv new file mode 100644 index 000000000..d0136c721 --- /dev/null +++ b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/logs/logs.csv @@ -0,0 +1,10 @@ +2024-07-16 12:00:00,INFO,Application started successfully,App1,host1 +2024-07-16 12:01:00,DEBUG,User logged in,App1,host1 +2024-07-16 12:01:05,ERROR,Failed to load resource,App1,host1 +2024-07-16 12:02:00,WARN,Deprecated API used,App1,host1 +2024-07-16 12:03:00,INFO,Background job executed,App1,host1 +2024-07-16 12:04:00,DEBUG,Cache cleared,App1,host1 +2024-07-16 12:05:00,INFO,User logged out,App1,host1 +2024-07-16 12:06:00,ERROR,Database connection failed,App1,host1 +2024-07-16 12:07:00,INFO,Application shutdown initiated,App1,host1 +2024-07-16 12:08:00,INFO,Application shutdown completed,App1,host1 diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/opensearch_dashboards.yml b/public/components/getting_started/getting_started_artifacts/csv_file/getting-started/opensearch_dashboards.yml similarity index 100% rename from public/components/getting_started/getting_started_artifacts/csv_file/getting-started/fluent-bit/opensearch_dashboards.yml rename to public/components/getting_started/getting_started_artifacts/csv_file/getting-started/opensearch_dashboards.yml diff --git a/public/components/getting_started/getting_started_artifacts/csv_file/info/Getting-Started.md b/public/components/getting_started/getting_started_artifacts/csv_file/info/Getting-Started.md index 4f8e83ffe..344b66f84 100644 --- a/public/components/getting_started/getting_started_artifacts/csv_file/info/Getting-Started.md +++ b/public/components/getting_started/getting_started_artifacts/csv_file/info/Getting-Started.md @@ -120,7 +120,7 @@ Under the `getting-started` section you can examine a live docker-compose sample |-- logs.csv ``` -Use the [docker-compose](../getting-started/fluent-bit/docker-complete.yml) you can find a complete: +Use the [docker-compose](../getting-started/docker-complete.yml) you can find a complete: `docker compose -f docker-complete.yml up -d` would instantiate the services and start sending the csv sample logs into an index. diff --git a/public/components/getting_started/getting_started_artifacts/golang_client/golang_client-1.0.0.json b/public/components/getting_started/getting_started_artifacts/golang_client/golang_client-1.0.0.json index 9d3184ef9..2ebccfd1f 100644 --- a/public/components/getting_started/getting_started_artifacts/golang_client/golang_client-1.0.0.json +++ b/public/components/getting_started/getting_started_artifacts/golang_client/golang_client-1.0.0.json @@ -11,7 +11,7 @@ "golang" ], "author": "OpenSearch", - "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/golang_client/info", + "sourceUrl": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client", "workflows": [ { "name": "dashboards", @@ -84,8 +84,8 @@ "type": "host-name" } ], - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/.env"], - "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/.env", + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/getting-started/.env"], + "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/.env", "description": "Setup docker-compose env variables " }, { @@ -93,10 +93,10 @@ "label": "Environment Parameters", "phase": "docker", "type": "file-url", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/fluent-bit/fluent-bit.conf", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/fluent-bit/parsers.conf" + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/getting-started/fluent-bit/fluent-bit.conf", + "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/getting-started/fluent-bit/parsers.conf" ], - "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/fluent-bit/fluent-bit.conf \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/fluent-bit/parsers.conf\n", + "content": "mkdir -p fluent-bit\nwget -P fluent-bit https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/fluent-bit/fluent-bit.conf \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/fluent-bit/parsers.conf\n", "description": "Setup docker-compose fluent-bit's service configuration " }, { @@ -104,11 +104,11 @@ "label": "Environment Parameters", "phase": "docker", "type": "file-url", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/golang-app/Dockerfile", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/golang-app/go.mod", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/golang-app/main.go" + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/getting-started/golang-app/Dockerfile", + "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/getting-started/golang-app/go.mod", + "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/getting-started/golang-app/main.go" ], - "content": "wget https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/golang-app/Dockerfile \\\n https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/golang-app/go.mod \\\n https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/golang-app/main.go \n", + "content": "mkdir -p golang-app\nwget -P golang-app https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/golang-app/Dockerfile \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/golang-app/go.mod \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/golang-app/main.go \n", "description": "Setup docker-compose golan-app service configuration " }, { @@ -116,9 +116,9 @@ "label": "live container", "type": "file-url", "phase": "docker", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/getting-started/docker-compose.yml"], + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/getting-started/docker-compose.yml"], "description": "Run docker-compose for the gloang-client live example and see the generated index", - "content": "wget -O docker-compose.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/golang_client/getting-started/docker-compose.yml && docker-compose up --build \n" + "content": "wget -O docker-compose.yml https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/getting-started/docker-compose.yml && docker-compose up --build -d golang-app fluent-bit \n" } ] }, @@ -226,7 +226,7 @@ ], "content": "PUT _index_template/application_logs_template", "description": "Setup applicative logs index template in the dev console", - "index-template": "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/schemas/applicative-logs-1.0.0.mapping.json", + "index-template": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/schemas/applicative-logs-1.0.0.mapping.json", "index-pattern-name": "applicative_logs-*" } ], @@ -238,7 +238,7 @@ "https://opensearch.org/docs/latest/dashboards/management/index-patterns/" ], "description": "Import index patterns `.ndjson` file to the saved objects", - "index-pattern": "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/golang_client/assets/tutorial-1.0.0.ndjson", + "index-pattern": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/golang_client/assets/tutorial-1.0.0.ndjson", "index-patterns-name": [ "applicative_logs-*" ] @@ -246,4 +246,4 @@ "sampleData": { "path": "sample.json" } -} \ No newline at end of file +} diff --git a/public/components/getting_started/getting_started_artifacts/java_client/java_client-1.0.0.json b/public/components/getting_started/getting_started_artifacts/java_client/java_client-1.0.0.json index 16df1d8b0..1580e26b3 100644 --- a/public/components/getting_started/getting_started_artifacts/java_client/java_client-1.0.0.json +++ b/public/components/getting_started/getting_started_artifacts/java_client/java_client-1.0.0.json @@ -7,7 +7,7 @@ "type": "logs", "labels": ["Observability", "Logs", "java"], "author": "OpenSearch", - "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/nginx/info", + "sourceUrl": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client", "workflows": [ { "name": "dashboards", @@ -70,8 +70,8 @@ "type": "host-name" } ], - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/.env"], - "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/.env", + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/getting-started/.env"], + "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/.env", "description": "Setup docker-compose env variables " }, { @@ -79,10 +79,10 @@ "label": "Environment Parameters", "phase": "docker", "type": "file-url", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/fluent-bit/fluent-bit.conf", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/fluent-bit/parsers.conf" + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/getting-started/fluent-bit/fluent-bit.conf", + "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/getting-started/fluent-bit/parsers.conf" ], - "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/fluent-bit/fluent-bit.conf \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/fluent-bit/parsers.conf\n", + "content": "mkdir -p fluent-bit\nwget -P fluent-bit https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/fluent-bit/fluent-bit.conf \\\n https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/getting-started/fluent-bit/parsers.conf \n", "description": "Setup docker-compose fluent-bit's service configuration " }, { @@ -90,11 +90,11 @@ "label": "Environment Parameters", "phase": "docker", "type": "file-url", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/Dockerfile", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/src/main/java/App.java", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/pom.xml" + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/getting-started/java-app/Dockerfile", + "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/getting-started/java-app/src/main/java/App.java", + "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/getting-started/java-app/pom.xml" ], - "content": "wget https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/Dockerfile \\\n https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/pom.xml \\\n https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/java-app/src/main/java/App.java \n", + "content": "mkdir -p java-app\nwget -P java-app https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/java-app/Dockerfile \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/java-app/pom.xml \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/java-app/src/main/java/App.java \n", "description": "Setup docker-compose java-app service configuration " }, { @@ -102,9 +102,9 @@ "label": "live container", "type": "file-url", "phase": "docker", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/getting-started/docker-compose.yml"], + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/getting-started/docker-compose.yml"], "description": "Run docker-compose for the java-client live example and see the generated index", - "content": "wget -O docker-compose.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/docker-compose.yml && docker-compose up --build \n" + "content": "wget -O docker-compose.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/java_client/getting-started/docker-compose.yml && docker-compose up --build -d java-app fluent-bit \n" } ] }, @@ -188,7 +188,7 @@ ], "content": "PUT _index_template/application_logs_template", "description": "Setup applicative logs index template in the dev console", - "index-template": "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/schemas/applicative-logs-1.0.0.mapping.json", + "index-template": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/schemas/applicative-logs-1.0.0.mapping.json", "index-pattern-name": "applicative_logs-*" } ], @@ -200,7 +200,7 @@ "https://opensearch.org/docs/latest/dashboards/management/index-patterns/" ], "description": "Import index patterns `.ndjson` file to the saved objects", - "index-pattern": "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/java_client/assets/tutorial-1.0.0.ndjson", + "index-pattern": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/java_client/assets/tutorial-1.0.0.ndjson", "index-patterns-name": [ "applicative_logs-*" ] @@ -209,4 +209,4 @@ "sampleData": { "path": "sample.json" } -} \ No newline at end of file +} diff --git a/public/components/getting_started/getting_started_artifacts/nginx/nginx-1.0.0.json b/public/components/getting_started/getting_started_artifacts/nginx/nginx-1.0.0.json index d75aaa022..d70847ff0 100644 --- a/public/components/getting_started/getting_started_artifacts/nginx/nginx-1.0.0.json +++ b/public/components/getting_started/getting_started_artifacts/nginx/nginx-1.0.0.json @@ -11,7 +11,7 @@ "Flint S3" ], "author": "OpenSearch", - "sourceUrl": "https://github.com/opensearch-project/dashboards-observability/tree/main/server/adaptors/integrations/__data__/repository/nginx/info", + "sourceUrl": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/nginx", "workflows": [ { "name": "queries", @@ -108,7 +108,7 @@ } ], "getting-started": { - "info": "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/nginx/info/Getting-Started.md", + "info": "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/nginx/getting-started/Getting-Started.md", "ingestion": ["fluent-bit"], "structured": "true", "technology": "nginx", @@ -144,8 +144,8 @@ "type": "host-name" } ], - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/nginx/getting-started/.env"], - "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/tree/main/integrations/observability/nginx/getting-started/.env", + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/nginx/getting-started/.env"], + "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/nginx/getting-started/.env", "description": "Setup docker-compose env variables " }, { @@ -153,11 +153,11 @@ "label": "Environment Parameters", "phase": "docker", "type": "file-url", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/nginx/getting-started/fluent-bit/fluent-bit.conf", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/nginx/getting-started/fluent-bit/otel-converter.lua", - "https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/nginx/getting-started/fluent-bit/parsers.conf" + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/nginx/getting-started/fluent-bit/fluent-bit.conf", + "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/nginx/getting-started/fluent-bit/otel-converter.lua", + "https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/nginx/getting-started/fluent-bit/parsers.conf" ], - "content": "wget https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/nginx/getting-started/fluent-bit/fluent-bit.conf \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/nginx/getting-started/fluent-bit/otel-converter.lua \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/nginx/getting-started/fluent-bit/parsers.conf\n", + "content": "mkdir -p fluent-bit\nwget -P fluent-bit https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/nginx/getting-started/fluent-bit/fluent-bit.conf \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/nginx/getting-started/fluent-bit/otel-converter.lua \\\n https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/nginx/getting-started/fluent-bit/parsers.conf\n", "description": "Setup docker-compose fluent-bit's service configuration " }, { @@ -165,7 +165,7 @@ "label": "live container", "type": "file-url", "phase": "docker", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/nginx/getting-started/nginx-node.yml"], + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/nginx/getting-started/nginx-node.yml"], "description": "Run docker-compose for the nginx live example and see the generated index", "content": "wget -O nginx-node.yml https://github.com/raw/opensearch-project/opensearch-catalog/main/integrations/observability/nginx/getting-started/nginx-node.yml && docker-compose -f nginx-node.yml up -d\n" } @@ -180,7 +180,7 @@ "type": "console-cmd", "phase": "ingestion", "label": "Log Parsing", - "info": ["https://github.com/opensearch-project/opensearch-catalog/tree/main/integrations/observability/nginx/getting-started/fluent-bit/parsers.conf"], + "info": ["https://github.com/opensearch-project/opensearch-catalog/blob/main/integrations/observability/nginx/getting-started/fluent-bit/parsers.conf"], "description": "Setup Fluent-Bit parser config file parsing Nginx access log fields", "content": "[PARSER]\n Name apache\n Format regex\n Regex ^(?[^ ]*) [^ ]* (?[^ ]*) \\[(?