Merge branch 'main' into 'enterprise'

Sync open source commits

See merge request dkinternal/observability/dataops-observability!18

Author: aarthy-dk

CONTRIBUTING.md

@@ -12,7 +12,7 @@ You can submit a proposal for a new feature by creating a [GitHub Issue](https:/
 
 ## Join our Community
 
-Join our [Slack community](https://data-observability.slack.com) for discussions with other Data Observability users.
+Join our [Slack community](https://data-observability-slack.datakitchen.io/join) for discussions with other Data Observability users.
 
 ## Code Submission
 

CONTRIBUTORS.md

@@ -0,0 +1,23 @@
+# Contributors
+
+Thanks to everyone who has contributed to DataOps Observability!
+
+💻 = code, 🚇 = infrastructure, 📖 = documentation, 📆 = project management, 🤔 = product management, 💬 = user support
+
+- [Samantha Hamilton](https://www.linkedin.com/in/shamilton-darlingdocs/) 📖
+- [David Kershaw](https://www.linkedin.com/in/evisioner/) 🤔
+- [Khanh Tran](https://www.linkedin.com/in/k-tran) 💻
+- [Abhinav Tiwari](https://www.linkedin.com/in/abhinavyogeshtiwari) 💬
+- [Javier Giulianetti](https://github.com/JavierGi) 🚇
+- [Jimmie Högklint](https://github.com/hogklint) 💻 🚇 
+- [Davide Cavaliere](https://github.com/microph1) 💻 🚇 
+- [Brant Watson](https://github.com/induane) 💻
+- [Tyler Stubenvoll](https://github.com/tjstub) 💻 📆 📖 🚇
+- [Alejandro Fernandez](https://www.linkedin.com/in/afabriciof) 💻
+- [Ricardo Boni](https://www.linkedin.com/in/ricardo-boni-9b15744/) 💻 📆 🚇
+- [Diogo Basto](https://www.linkedin.com/in/diogo-t-basto/) 💻 🚇
+- [Luis Trinidad](https://www.linkedin.com/in/strinidad) 💻 📆 🚇
+- [Aarthy Adityan](https://www.linkedin.com/in/aarthyadityan) 🤔 📆 💻 📖 
+- [Eric Estabrooks](https://www.linkedin.com/in/ericestabrooks/) 🤔
+- [Gil Benghiat](https://www.linkedin.com/in/gilbertbenghiat/) 🤔 💬
+- [Chris Bergh](https://www.linkedin.com/in/chrisbergh/) 🤔 📖

README.md

@@ -1,7 +1,7 @@
 # DataOps Observability 
 ![apache 2.0 license Badge](https://img.shields.io/badge/License%20-%20Apache%202.0%20-%20blue) ![PRs Badge](https://img.shields.io/badge/PRs%20-%20Welcome%20-%20green) [![Docker Pulls](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fdatakitchen%2Fdataops-testgen%2F&query=pull_count&style=flat&label=docker%20pulls&color=06A04A)](https://hub.docker.com/r/datakitchen/dataops-observability) [![Documentation](https://img.shields.io/badge/docs-On%20datakitchen.io-06A04A?style=flat)](https://docs.datakitchen.io/articles/#!dataops-observability-help/dataops-observability-help) 
 [![Latest Version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fhub.docker.com%2Fv2%2Frepositories%2Fdatakitchen%2Fdataops-observability-be%2Ftags%2F&query=results%5B0%5D.name&label=latest%20version&color=06A04A)](https://hub.docker.com/r/datakitchen/dataops-observability-be)
-[![Static Badge](https://img.shields.io/badge/Slack-Join%20Discussion-blue?style=flat&logo=slack)](https://data-observability.slack.com)
+[![Static Badge](https://img.shields.io/badge/Slack-Join%20Discussion-blue?style=flat&logo=slack)](https://data-observability-slack.datakitchen.io/join)
 
 *<p style="text-align: center;">DataOps Observability is part of DataKitchen's Open Source Data Observability. DataOps Observability monitors every data journey from data source to customer value, from any team development environment into production, across every tool, team, environment, and customer so that problems are detected, localized, and understood immediately.</p>*
 
@@ -148,6 +148,9 @@ To resolve this error, do two things:
 ### Getting Started Guide
 We recommend you start by going through the [Data Observability Overview Demo](https://docs.datakitchen.io/articles/open-source-data-observability/data-observability-overview).
 
+### Support
+For support requests, [join the Data Observability Slack](https://data-observability-slack.datakitchen.io/join) and ask post on #support channel.
+
 ### Connect
 Talk and Learn with other data practitioners who are building with DataKitchen. Share knowledge, get help, and contribute to our open-source project. 
 
@@ -163,7 +166,7 @@ Join our community here:
 
 * 📚 [Read our blog posts](https://datakitchen.io/blog/)
 
-* 👋 [Join us on Slack](https://data-observability.slack.com)
+* 👋 [Join us on Slack](https://data-observability-slack.datakitchen.io/join)
 
 * 🗃 [Sign The DataOps Manifesto](https://DataOpsManifesto.org)
 

observability_ui/apps/basic-auth/src/app/login/login.component.ts

@@ -45,7 +45,7 @@ export class LoginComponent {
     ).subscribe({
       next: (url) => this.router.navigateByUrl(url),
       error: (error) => {
-        this.loginError = 'Invalid credentials: Wrong email or password.';
+        this.loginError = error.error?.error || (error.status === 0 ? 'Unable to reach Observability API.' : error.message);
         console.error(error);
       },
     });

observability_ui/apps/shell/src/app/projects/integrations/tools/abstract-tool.directive.ts

@@ -62,7 +62,7 @@ export abstract class AbstractTool implements OnInit {
   ];
   protected readonly eventsAgentsCommonEnvs: any[] = [];
   protected readonly commonEnvs = [
-    { name: 'EVENTS_API_HOST', placeholder: '', required: true },
+    { name: 'EVENTS_API_HOST', placeholder: '# the base API URL for Observability', required: true },
     { name: 'EVENTS_API_KEY', placeholder: '# an API key for the Observability project', required: true },
     { name: 'EVENTS_PROJECT_ID', placeholder: '# the ID of the Observability project', required: true },
     { name: 'EXTERNAL_PLUGINS_PATH', placeholder: '# the path where any custom plugins can be accessed', required: true },
@@ -140,7 +140,6 @@ export abstract class AbstractTool implements OnInit {
 
   ngOnInit(): void {
     [
-      this.commonEnvsForm.controls['EVENTS_API_HOST'],
       this.commonEnvsForm.controls['EVENTS_PROJECT_ID'],
       this.commonEnvsForm.controls['EXTERNAL_PLUGINS_PATH'],
       this.commonEnvsForm.controls['ENABLED_PLUGINS'],
@@ -176,7 +175,9 @@ export abstract class AbstractTool implements OnInit {
     let dockerExtraEnvVars: string = '';
     let kubernetesExtraEnvVars: string = '';
     const valuePerVariable: {[name: string]: string} = {
+      // k8s does not like underscores
       target_service: this.name.replaceAll('_', '-'),
+      deployment_name: `${this.envListForm.controls['AGENT_TYPE']?.value}-${this.envListForm.controls['AGENT_KEY']?.value}`.replaceAll('_', '-'),
       docker_image: this.image,
       docker_tag: this.envListForm.controls['DOCKER_TAG'].value,
       default_deployment_mode: this.envListForm.controls['DEFAULT_DEPLOYMENT_MODE'].value,
@@ -188,7 +189,7 @@ export abstract class AbstractTool implements OnInit {
     for (const variable of this.envList) {
       if (!variable.hidden && !variable.excluded) {
         const slotInTemplate = variable.tpl ?? variable.name.toLowerCase();
-        let value = this.envListForm.controls[variable.name].value ?? variable.default ?? '';
+        let value = this.envListForm.controls[variable.name].value || variable.default || '';
         if (variable.formatter) {
           value = variable.formatter(value);
         }

observability_ui/apps/shell/src/app/projects/integrations/tools/agent-script-v2.tpl

@@ -5,7 +5,7 @@ set -eo pipefail
 SCRIPT_NAME=$(basename "$0")
 DOCKER_DEPLOY_FILE="deploy-docker-agent.json"
 KUBERNETES_DEPLOY_FILE="deploy-kubernetes-agent.json"
-DEPLOYMENT_NAME="{{agent_type}}_{{agent_key}}"
+DEPLOYMENT_NAME="{{deployment_name}}"
 SECRET_NAME="observability-agent-secret"
 NAMESPACE="datakitchen"
 
@@ -217,6 +217,9 @@ create_docker_compose_file() {
     "$DEPLOYMENT_NAME": {
       "image": "$DOCKER_IMAGE:$DOCKER_TAG",
       "container_name": "$DEPLOYMENT_NAME",
+      "extra_hosts": [
+        "host.docker.internal:host-gateway"
+      ],
       "environment": [
         "DK_AGENT_TYPE=$DK_AGENT_TYPE",
         "DK_AGENT_KEY=$DK_AGENT_KEY",

observability_ui/apps/shell/src/app/projects/integrations/tools/agent-script.tpl

@@ -117,6 +117,8 @@ services:
   $TARGET_SERVICE:
     image: $image
     container_name: $TARGET_SERVICE
+    extra_hosts:
+      - host.docker.internal:host-gateway
     environment:
       - EVENTS_API_HOST='$EVENTS_API_HOST'
       - EVENTS_API_KEY='$EVENTS_API_KEY'

observability_ui/apps/shell/src/app/projects/integrations/tools/airflow-tool/airflow-tool.component.html

@@ -14,9 +14,6 @@ <h2>Step 1: Prerequisites</h2>
   </mat-expansion-panel-header>
 
   <ul>
-    <li>
-      Request access to the agent's private Docker repository from your DataKitchen representative.
-    </li>
     <li>
       An API key unique to this agent is recommended. Use the form below to create a key.
     </li>

observability_ui/apps/shell/src/app/projects/integrations/tools/airflow-tool/airflow-tool.component.ts

@@ -39,7 +39,7 @@ export class AirflowToolComponent extends AbstractTool {
   static override _name = 'airflow';
   static override _displayName = 'Airflow';
   static override _icon = 'airflow';
-  static override _image = 'docker.io/datakitchen/observability-agent-trial';
+  static override _image = 'docker.io/datakitchen/dataops-observability-agents';
   static override _version = 'production';
 
   private readonly defaultValues = {
@@ -49,7 +49,7 @@ export class AirflowToolComponent extends AbstractTool {
   override readonly envList = [
     { name: 'AGENT_TYPE', tpl: 'agent_type', placeholder: '' },
     { name: 'AGENT_KEY', tpl: 'agent_key', placeholder: '# assigns the identifier of the agent', required: true },
-    { name: 'DK_API_URL', tpl: 'observability_base_url', placeholder: '# the URL to the Observability API', required: true },
+    { name: 'DK_API_URL', tpl: 'observability_base_url', placeholder: '# the base API URL for Observability', required: true },
     { name: 'DK_API_KEY', tpl: 'observability_service_account_key', placeholder: '# an API key for the Observability project', required: true },
     { name: 'API_URL', tpl: 'airflow_api_url', placeholder: '# the URL to the Airflow API', required: true },
     { name: 'USERNAME', tpl: 'auth_agent_username', placeholder: '# the username for an Airflow account', required: true },

observability_ui/apps/shell/src/app/projects/integrations/tools/aws-sqs-tool/aws-sqs-tool.component.html

@@ -14,9 +14,6 @@ <h2>Step 1: Prerequisites</h2>
   </mat-expansion-panel-header>
 
   <ul>
-    <li>
-      Request access to the agent's private Docker repository from your DataKitchen representative.
-    </li>
     <li>
       An API key unique to this agent is recommended. Use the form below to create a key.
     </li>