Update values.yml file URL

elastic · Jan 7, 2025 · 0ce76c3 · 0ce76c3
1 parent 2c97ed3
commit 0ce76c3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/..._onboarding/public/application/quickstart_flows/otel_kubernetes/otel_kubernetes_panel.tsx b/..._onboarding/public/application/quickstart_flows/otel_kubernetes/otel_kubernetes_panel.tsx
@@ -26,28 +26,30 @@ import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { DASHBOARD_APP_LOCATOR } from '@kbn/deeplinks-analytics';
 import { css } from '@emotion/react';
+import { ObservabilityOnboardingAppServices } from '../../..';
 import { EmptyPrompt } from '../shared/empty_prompt';
 import { GetStartedPanel } from '../shared/get_started_panel';
 import { FeedbackButtons } from '../shared/feedback_buttons';
 import { CopyToClipboardButton } from '../shared/copy_to_clipboard_button';
-import { ObservabilityOnboardingContextValue } from '../../../plugin';
 import { useKubernetesFlow } from '../kubernetes/use_kubernetes_flow';
 
 const OTEL_HELM_CHARTS_REPO = 'https://open-telemetry.github.io/opentelemetry-helm-charts';
 const OTEL_KUBE_STACK_VERSION = '0.3.3';
-const OTEL_KUBE_STACK_VALUES_FILE_URL =
-  'https://raw.githubusercontent.com/elastic/opentelemetry/refs/heads/8.16/resources/kubernetes/operator/helm/values.yaml';
 const CLUSTER_OVERVIEW_DASHBOARD_ID = 'kubernetes_otel-cluster-overview';
 
 export const OtelKubernetesPanel: React.FC = () => {
   const { data, error, refetch } = useKubernetesFlow('kubernetes_otel');
   const [idSelected, setIdSelected] = useState('nodejs');
   const {
-    services: { share },
-  } = useKibana<ObservabilityOnboardingContextValue>();
+    services: {
+      share,
+      context: { kibanaBranch },
+    },
+  } = useKibana<ObservabilityOnboardingAppServices>();
   const apmLocator = share.url.locators.get('APM_LOCATOR');
   const dashboardLocator = share.url.locators.get(DASHBOARD_APP_LOCATOR);
   const theme = useEuiTheme();
+  const otelKubeStackValuesFileUrl = `https://raw.githubusercontent.com/elastic/elastic-agent/refs/heads/${kibanaBranch}/deploy/helm/edot-collector/kube-stack/values.yaml`;
 
   if (error) {
     return (
@@ -65,7 +67,7 @@ kubectl create secret generic elastic-secret-otel \\
   --from-literal=elastic_api_key='${data.apiKeyEncoded}'
 helm install opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \\
   --namespace ${namespace} \\
-  --values '${OTEL_KUBE_STACK_VALUES_FILE_URL}' \\
+  --values '${otelKubeStackValuesFileUrl}' \\
   --version '${OTEL_KUBE_STACK_VERSION}'`
     : undefined;
 
@@ -160,7 +162,7 @@ helm install opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack \\
                   <EuiFlexItem grow={false}>
                     <EuiButtonEmpty
                       iconType="download"
-                      href={OTEL_KUBE_STACK_VALUES_FILE_URL}
+                      href={otelKubeStackValuesFileUrl}
                       flush="left"
                       target="_blank" // The `download` attribute does not work cross-origin so it's better to open the file in a new tab
                       data-test-subj="observabilityOnboardingOtelKubernetesPanelDownloadValuesFileButton"

diff --git a/x-pack/solutions/observability/plugins/observability_onboarding/public/index.ts b/x-pack/solutions/observability/plugins/observability_onboarding/public/index.ts
@@ -35,6 +35,7 @@ export interface AppContext {
   isServerless: boolean;
   stackVersion: string;
   cloudServiceProvider?: string;
+  kibanaBranch: string;
 }
 
 export interface ObservabilityOnboardingAppServices {

diff --git a/x-pack/solutions/observability/plugins/observability_onboarding/public/plugin.ts b/x-pack/solutions/observability/plugins/observability_onboarding/public/plugin.ts
@@ -81,6 +81,7 @@ export class ObservabilityOnboardingPlugin
     const config = this.ctx.config.get<ObservabilityOnboardingConfig>();
     const isServerlessBuild = this.ctx.env.packageInfo.buildFlavor === 'serverless';
     const isDevEnvironment = this.ctx.env.mode.dev;
+    const kibanaBranch = this.ctx.env.packageInfo.branch;
     const pluginSetupDeps = plugins;
 
     core.application.register({
@@ -113,6 +114,7 @@ export class ObservabilityOnboardingPlugin
             isServerless: Boolean(pluginSetupDeps.cloud?.isServerlessEnabled) || isServerlessBuild,
             stackVersion,
             cloudServiceProvider: pluginSetupDeps.cloud?.csp,
+            kibanaBranch,
           },
         });
       },