Merge branch 'main' into dependabot/go_modules/autoscaler/otel-depend…

…encies-c31fd0f9b0
odigos-io · Oct 13, 2024 · d0491e3 · d0491e3
2 parents 5f9ed9c + adee85f
commit d0491e3
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/docs/images/pods_ready.png b/docs/images/pods_ready.png
diff --git a/docs/quickstart/introduction.mdx b/docs/quickstart/introduction.mdx
@@ -72,11 +72,9 @@ kubectl apply -f https://raw.githubusercontent.com/odigos-io/simple-demo/main/ku
 
 Before moving to the next step, make sure that the application pods and Jaeger pods are running, this may take a few minutes.
 ```bash
-kubectl get pods -n tracing
-```
-```bash
-kubectl get pods -n default
+kubectl wait --for=condition=available --timeout=300s deployment --all --all-namespaces
 ```
+
 <Frame>
-  <img src="/images/pods_ready.png" alt="Pods ready" />
+  <img src="/images/pods_ready.png" alt="Deployments Ready" />
 </Frame>
diff --git a/frontend/webapp/containers/main/sources/choose.sources/index.tsx b/frontend/webapp/containers/main/sources/choose.sources/index.tsx
@@ -15,7 +15,7 @@ export function SelectSourcesContainer() {
   return (
     <div style={{ height: '100vh' }}>
       <OverviewHeader
-        title={OVERVIEW.MENU.SOURCES}
+        title={OVERVIEW.ADD_NEW_SOURCE}
         onBackClick={() => router.back()}
       />
       <NewSourcesList onSuccess={onNewSourceSuccess} />

diff --git a/frontend/webapp/hooks/useSectionData.tsx b/frontend/webapp/hooks/useSectionData.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from "react";
+import { useMemo, useState } from 'react';
 
 export function useSectionData(initialData) {
   const [sectionData, setSectionData] = useState(initialData);
@@ -7,9 +7,12 @@ export function useSectionData(initialData) {
     let total = 0;
     for (const key in sectionData) {
       const apps = sectionData[key]?.objects;
-      const counter = apps?.filter((item) => item.selected)?.length;
+      const counter = apps?.filter(
+        (item) => item.selected && !item.app_instrumentation_labeled
+      )?.length;
       total += counter;
     }
+
     return total;
   }, [JSON.stringify(sectionData)]);
 

diff --git a/frontend/webapp/utils/constants/string.tsx b/frontend/webapp/utils/constants/string.tsx
@@ -75,7 +75,7 @@ export const OVERVIEW = {
   ADD_NEW_ACTION: 'Add New Action',
   EMPTY_DESTINATION: 'No destinations found',
   EMPTY_ACTION: 'No actions found',
-  EMPTY_SOURCE: 'No sources found',
+  EMPTY_SOURCE: 'No sources found in this namespace',
   DESTINATION_UPDATE_SUCCESS: 'Destination updated successfully',
   DESTINATION_CREATED_SUCCESS: 'Destination created successfully',
   DESTINATION_DELETED_SUCCESS: 'Destination deleted successfully',

diff --git a/odiglet/go.mod b/odiglet/go.mod
@@ -19,7 +19,7 @@ require (
 	go.opentelemetry.io/otel v1.29.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0
 	go.uber.org/zap v1.27.0
-	google.golang.org/grpc v1.66.0
+	google.golang.org/grpc v1.67.0
 	k8s.io/api v0.31.0
 	k8s.io/apimachinery v0.31.0
 	k8s.io/client-go v0.31.0
@@ -45,7 +45,7 @@ require (
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/goccy/go-yaml v1.11.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.2.1 // indirect
+	github.com/golang/glog v1.2.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect

diff --git a/odiglet/go.sum b/odiglet/go.sum
@@ -124,8 +124,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4=
-github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
+github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=
+github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -561,8 +561,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
-google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
+google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
+google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=