pull main and resolve conflicts

kyma-project · Sep 28, 2023 · c06adac · c06adac
2 parents 4be0c58 + 272aa3e
commit c06adac
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 113 deletions.
diff --git a/public/i18n/en.yaml b/public/i18n/en.yaml
@@ -710,12 +710,6 @@ gardener:
     provider: Provider
 generic-list:
   no-entries-found: No entries found
-grafana:
-  logs: Logs
-  missing-domain: Grafana service does not have a host defined
-  not-exposed: Grafana service is not exposed
-  open-in-grafana: Open in Grafana
-  unavailable: No Grafana link
 graphs:
   capacity: Capacity
   cpu: CPU

diff --git a/src/resources/Pods/ContainersLogs.js b/src/resources/Pods/ContainersLogs.js
diff --git a/src/shared/components/LogsLink/LogsLink.js b/src/shared/components/LogsLink/LogsLink.js
diff --git a/src/shared/components/LogsLink/LogsLink.scss b/src/shared/components/LogsLink/LogsLink.scss