From 2f453612ccf6114deca6747ec390c261a37aaac2 Mon Sep 17 00:00:00 2001 From: Nox Date: Wed, 26 Aug 2020 04:41:46 +0200 Subject: [PATCH] Add ability to get previous logs of a container Signed-off-by: Nox --- locales/en/messages.po | 64 +++++++++++-------- locales/fi/messages.po | 64 +++++++++++-------- locales/ru/messages.po | 64 +++++++++++-------- src/renderer/api/endpoints/pods.api.ts | 1 + .../+workloads-pods/pod-logs-dialog.tsx | 16 ++++- 5 files changed, 130 insertions(+), 79 deletions(-) diff --git a/locales/en/messages.po b/locales/en/messages.po index 8859dde6a8..b5b0941c4e 100644 --- a/locales/en/messages.po +++ b/locales/en/messages.po @@ -84,7 +84,7 @@ msgid "Active" msgstr "Active" #: src/renderer/components/+add-cluster/add-cluster.tsx:171 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:116 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:118 msgid "Add Cluster" msgstr "Add Cluster" @@ -195,7 +195,7 @@ msgstr "All clusters within workspace will be cleared as well" msgid "All groups" msgstr "All groups" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:58 msgid "All logs" msgstr "All logs" @@ -449,9 +449,9 @@ msgstr "Claim" msgid "Claim Name" msgstr "Claim Name" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:251 #: src/renderer/components/dialog/logs-dialog.tsx:39 -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:94 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93 msgid "Close" msgstr "Close" @@ -522,7 +522,7 @@ msgstr "Conditions" msgid "Config Maps" msgstr "Config Maps" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:55 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:54 msgid "Config copied to clipboard" msgstr "Config copied to clipboard" @@ -542,7 +542,7 @@ msgstr "Configuration" msgid "Connection" msgstr "Connection" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:254 msgid "Container" msgstr "Container" @@ -571,7 +571,7 @@ msgid "Container runtime" msgstr "Container runtime" #: src/renderer/components/+workloads-pods/pod-details.tsx:122 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:193 #: src/renderer/components/+workloads-pods/pods.tsx:77 msgid "Containers" msgstr "Containers" @@ -594,7 +594,7 @@ msgid "Conversion" msgstr "Conversion" #: src/renderer/components/dialog/logs-dialog.tsx:36 -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:88 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:87 msgid "Copy to clipboard" msgstr "Copy to clipboard" @@ -811,7 +811,7 @@ msgstr "Domains" msgid "Download Mirror" msgstr "Download Mirror" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:91 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:90 msgid "Download file" msgstr "Download file" @@ -915,7 +915,7 @@ msgstr "External IP" msgid "External IPs" msgstr "External IPs" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:109 msgid "Failed to load logs: {0}" msgstr "Failed to load logs: {0}" @@ -956,7 +956,7 @@ msgstr "Forbidden Sysctls" msgid "From" msgstr "From" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:219 msgid "From <0>{from} to <1>{to}" msgstr "From <0>{from} to <1>{to}" @@ -1019,7 +1019,7 @@ msgid "Helm branch <0>{0} already in use" msgstr "Helm branch <0>{0} already in use" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Hide" msgstr "Hide" @@ -1104,7 +1104,7 @@ msgid "Ingresses" msgstr "Ingresses" #: src/renderer/components/+workloads-pods/pod-details.tsx:118 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:199 msgid "Init Containers" msgstr "Init Containers" @@ -1201,7 +1201,7 @@ msgstr "Kind" msgid "Kubeconfig" msgstr "Kubeconfig" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:85 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:84 msgid "Kubeconfig File" msgstr "Kubeconfig File" @@ -1262,7 +1262,7 @@ msgstr "Limited to {0}" msgid "Limits" msgstr "Limits" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:256 msgid "Lines" msgstr "Lines" @@ -1548,7 +1548,7 @@ msgstr "Network File System" msgid "Network Policies" msgstr "Network Policies" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:239 msgid "New logs since opening the dialog" msgstr "New logs since opening the dialog" @@ -1868,7 +1868,7 @@ msgstr "Readiness" msgid "Reason" msgstr "Reason" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:110 msgid "Reason: {0} ({1})" msgstr "Reason: {0} ({1})" @@ -2142,7 +2142,7 @@ msgstr "Runtime Class" #: src/renderer/components/+apps-releases/release-details.tsx:114 #: src/renderer/components/+config-maps/config-map-details.tsx:78 #: src/renderer/components/+config-secrets/secret-details.tsx:97 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:224 #: src/renderer/components/+workspaces/workspaces.tsx:120 #: src/renderer/components/dock/edit-resource.tsx:88 msgid "Save" @@ -2291,7 +2291,7 @@ msgstr "Shell" #: src/renderer/components/+config-secrets/secret-details.tsx:93 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" msgstr "Show" @@ -2300,6 +2300,14 @@ msgstr "Show" msgid "Show Notes" msgstr "Show Notes" +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "Show current" +msgstr "Show current" + +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "Show previous" +msgstr "Show previous" + #: src/renderer/components/+user-management-service-accounts/service-accounts-secret.tsx:20 msgid "Show value" msgstr "Show value" @@ -2446,7 +2454,7 @@ msgstr "Terminal" msgid "Terminal session" msgstr "Terminal session" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:234 msgid "There are no logs available for container." msgstr "There are no logs available for container." @@ -2486,13 +2494,13 @@ msgstr "Tolerations" msgid "Transmit" msgstr "Transmit" -#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:107 +#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:106 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:79 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:80 msgid "Trigger" msgstr "Trigger" -#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:103 +#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:102 msgid "Trigger CronJob <0>{cronjobName}" msgstr "Trigger CronJob <0>{cronjobName}" @@ -2730,12 +2738,16 @@ msgstr "kind" msgid "listKind" msgstr "listKind" +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "logs" +msgstr "logs" + #: src/renderer/components/+workloads-cronjobs/cronjob-details.tsx:48 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:61 msgid "never" msgstr "never" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:119 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:121 msgid "new" msgstr "new" @@ -2755,7 +2767,7 @@ msgstr "sec" msgid "singular" msgstr "singular" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 msgid "timestamps" msgstr "timestamps" @@ -2787,7 +2799,7 @@ msgstr "{0} total, {1} available" msgid "{0} unavailable" msgstr "{0} unavailable" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:129 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:128 msgid "{accountName} kubeconfig" msgstr "{accountName} kubeconfig" @@ -2799,7 +2811,7 @@ msgstr "{allItemsCount, plural, one {# item} other {# items}}" msgid "{metricsRemainCount} more..." msgstr "{metricsRemainCount} more..." -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 msgid "{podName} Logs" msgstr "{podName} Logs" diff --git a/locales/fi/messages.po b/locales/fi/messages.po index 464a49bf9e..7e2a2b3da5 100644 --- a/locales/fi/messages.po +++ b/locales/fi/messages.po @@ -84,7 +84,7 @@ msgid "Active" msgstr "" #: src/renderer/components/+add-cluster/add-cluster.tsx:171 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:116 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:118 msgid "Add Cluster" msgstr "" @@ -195,7 +195,7 @@ msgstr "" msgid "All groups" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:58 msgid "All logs" msgstr "" @@ -445,9 +445,9 @@ msgstr "" msgid "Claim Name" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:251 #: src/renderer/components/dialog/logs-dialog.tsx:39 -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:94 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93 msgid "Close" msgstr "" @@ -518,7 +518,7 @@ msgstr "" msgid "Config Maps" msgstr "" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:55 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:54 msgid "Config copied to clipboard" msgstr "" @@ -538,7 +538,7 @@ msgstr "" msgid "Connection" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:254 msgid "Container" msgstr "" @@ -567,7 +567,7 @@ msgid "Container runtime" msgstr "" #: src/renderer/components/+workloads-pods/pod-details.tsx:122 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:193 #: src/renderer/components/+workloads-pods/pods.tsx:77 msgid "Containers" msgstr "" @@ -590,7 +590,7 @@ msgid "Conversion" msgstr "" #: src/renderer/components/dialog/logs-dialog.tsx:36 -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:88 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:87 msgid "Copy to clipboard" msgstr "" @@ -807,7 +807,7 @@ msgstr "" msgid "Download Mirror" msgstr "" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:91 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:90 msgid "Download file" msgstr "" @@ -906,7 +906,7 @@ msgstr "" msgid "External IPs" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:109 msgid "Failed to load logs: {0}" msgstr "" @@ -947,7 +947,7 @@ msgstr "" msgid "From" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:219 msgid "From <0>{from} to <1>{to}" msgstr "" @@ -1010,7 +1010,7 @@ msgid "Helm branch <0>{0} already in use" msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Hide" msgstr "" @@ -1095,7 +1095,7 @@ msgid "Ingresses" msgstr "" #: src/renderer/components/+workloads-pods/pod-details.tsx:118 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:199 msgid "Init Containers" msgstr "" @@ -1192,7 +1192,7 @@ msgstr "" msgid "Kubeconfig" msgstr "" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:85 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:84 msgid "Kubeconfig File" msgstr "" @@ -1253,7 +1253,7 @@ msgstr "" msgid "Limits" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:256 msgid "Lines" msgstr "" @@ -1539,7 +1539,7 @@ msgstr "" msgid "Network Policies" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:239 msgid "New logs since opening the dialog" msgstr "" @@ -1851,7 +1851,7 @@ msgstr "" msgid "Reason" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:110 msgid "Reason: {0} ({1})" msgstr "" @@ -2125,7 +2125,7 @@ msgstr "" #: src/renderer/components/+apps-releases/release-details.tsx:114 #: src/renderer/components/+config-maps/config-map-details.tsx:78 #: src/renderer/components/+config-secrets/secret-details.tsx:97 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:224 #: src/renderer/components/+workspaces/workspaces.tsx:120 #: src/renderer/components/dock/edit-resource.tsx:88 msgid "Save" @@ -2274,7 +2274,7 @@ msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:93 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" msgstr "" @@ -2283,6 +2283,14 @@ msgstr "" msgid "Show Notes" msgstr "" +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "Show current" +msgstr "" + +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "Show previous" +msgstr "" + #: src/renderer/components/+user-management-service-accounts/service-accounts-secret.tsx:20 msgid "Show value" msgstr "" @@ -2429,7 +2437,7 @@ msgstr "" msgid "Terminal session" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:234 msgid "There are no logs available for container." msgstr "" @@ -2469,13 +2477,13 @@ msgstr "" msgid "Transmit" msgstr "" -#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:107 +#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:106 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:79 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:80 msgid "Trigger" msgstr "" -#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:103 +#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:102 msgid "Trigger CronJob <0>{cronjobName}" msgstr "" @@ -2713,12 +2721,16 @@ msgstr "" msgid "listKind" msgstr "" +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "logs" +msgstr "" + #: src/renderer/components/+workloads-cronjobs/cronjob-details.tsx:48 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:61 msgid "never" msgstr "" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:119 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:121 msgid "new" msgstr "" @@ -2738,7 +2750,7 @@ msgstr "" msgid "singular" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 msgid "timestamps" msgstr "" @@ -2770,7 +2782,7 @@ msgstr "" msgid "{0} unavailable" msgstr "" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:129 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:128 msgid "{accountName} kubeconfig" msgstr "" @@ -2782,7 +2794,7 @@ msgstr "" msgid "{metricsRemainCount} more..." msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 msgid "{podName} Logs" msgstr "" diff --git a/locales/ru/messages.po b/locales/ru/messages.po index 0200d47b72..794e0b1e7c 100644 --- a/locales/ru/messages.po +++ b/locales/ru/messages.po @@ -85,7 +85,7 @@ msgid "Active" msgstr "Активный" #: src/renderer/components/+add-cluster/add-cluster.tsx:171 -#: src/renderer/components/cluster-manager/clusters-menu.tsx:116 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:118 msgid "Add Cluster" msgstr "" @@ -196,7 +196,7 @@ msgstr "" msgid "All groups" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:57 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:58 msgid "All logs" msgstr "Все логи" @@ -450,9 +450,9 @@ msgstr "Запрос" msgid "Claim Name" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:243 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:251 #: src/renderer/components/dialog/logs-dialog.tsx:39 -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:94 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:93 msgid "Close" msgstr "Закрыть" @@ -523,7 +523,7 @@ msgstr "Состояния" msgid "Config Maps" msgstr "" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:55 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:54 msgid "Config copied to clipboard" msgstr "Конфигурация скопирована в буфер" @@ -543,7 +543,7 @@ msgstr "Конфигурация" msgid "Connection" msgstr "Соединение" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:246 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:254 msgid "Container" msgstr "Контейнер" @@ -572,7 +572,7 @@ msgid "Container runtime" msgstr "Среда контейнеров" #: src/renderer/components/+workloads-pods/pod-details.tsx:122 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:186 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:193 #: src/renderer/components/+workloads-pods/pods.tsx:77 msgid "Containers" msgstr "Контейнеры" @@ -595,7 +595,7 @@ msgid "Conversion" msgstr "" #: src/renderer/components/dialog/logs-dialog.tsx:36 -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:88 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:87 msgid "Copy to clipboard" msgstr "Копировать" @@ -812,7 +812,7 @@ msgstr "Домены" msgid "Download Mirror" msgstr "" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:91 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:90 msgid "Download file" msgstr "Скачать файл" @@ -916,7 +916,7 @@ msgstr "Внешний IP" msgid "External IPs" msgstr "Внешние IP" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:106 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:109 msgid "Failed to load logs: {0}" msgstr "Ошибка загрузки логов: {0}" @@ -957,7 +957,7 @@ msgstr "" msgid "From" msgstr "От" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:212 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:219 msgid "From <0>{from} to <1>{to}" msgstr "От <0>{from} до <1>{to}" @@ -1020,7 +1020,7 @@ msgid "Helm branch <0>{0} already in use" msgstr "" #: src/renderer/components/+config-secrets/secret-details.tsx:93 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Hide" msgstr "Скрыть" @@ -1105,7 +1105,7 @@ msgid "Ingresses" msgstr "Ingresses" #: src/renderer/components/+workloads-pods/pod-details.tsx:118 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:192 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:199 msgid "Init Containers" msgstr "Контейнеры инициализации" @@ -1202,7 +1202,7 @@ msgstr "Тип" msgid "Kubeconfig" msgstr "Файл конфигурации" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:85 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:84 msgid "Kubeconfig File" msgstr "Файл конфигурации" @@ -1263,7 +1263,7 @@ msgstr "" msgid "Limits" msgstr "Лимиты" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:256 msgid "Lines" msgstr "Строки" @@ -1549,7 +1549,7 @@ msgstr "Сетевая файловая система" msgid "Network Policies" msgstr "Network Policies" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:231 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:239 msgid "New logs since opening the dialog" msgstr "Новые логи с момента открытия диалога" @@ -1869,7 +1869,7 @@ msgstr "Готовность" msgid "Reason" msgstr "Причина" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:107 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:110 msgid "Reason: {0} ({1})" msgstr "Причина: {0} ({1})" @@ -2143,7 +2143,7 @@ msgstr "" #: src/renderer/components/+apps-releases/release-details.tsx:114 #: src/renderer/components/+config-maps/config-map-details.tsx:78 #: src/renderer/components/+config-secrets/secret-details.tsx:97 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:216 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:224 #: src/renderer/components/+workspaces/workspaces.tsx:120 #: src/renderer/components/dock/edit-resource.tsx:88 msgid "Save" @@ -2292,7 +2292,7 @@ msgstr "Командная строка" #: src/renderer/components/+config-secrets/secret-details.tsx:93 #: src/renderer/components/+workloads-pods/pod-container-env.tsx:100 -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 #: src/renderer/components/drawer/drawer-param-toggler.tsx:19 msgid "Show" msgstr "Показать" @@ -2301,6 +2301,14 @@ msgstr "Показать" msgid "Show Notes" msgstr "Показать логи" +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "Show current" +msgstr "" + +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "Show previous" +msgstr "" + #: src/renderer/components/+user-management-service-accounts/service-accounts-secret.tsx:20 msgid "Show value" msgstr "Показать значение" @@ -2447,7 +2455,7 @@ msgstr "Терминал" msgid "Terminal session" msgstr "Сессия терминала" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:226 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:234 msgid "There are no logs available for container." msgstr "Для контейнера нет логов." @@ -2487,13 +2495,13 @@ msgstr "Толерантности" msgid "Transmit" msgstr "Транзит" -#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:107 +#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:106 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:79 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:80 msgid "Trigger" msgstr "" -#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:103 +#: src/renderer/components/+workloads-cronjobs/cronjob-trigger-dialog.tsx:102 msgid "Trigger CronJob <0>{cronjobName}" msgstr "" @@ -2731,12 +2739,16 @@ msgstr "" msgid "listKind" msgstr "" +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:223 +msgid "logs" +msgstr "" + #: src/renderer/components/+workloads-cronjobs/cronjob-details.tsx:48 #: src/renderer/components/+workloads-cronjobs/cronjobs.tsx:61 msgid "never" msgstr "" -#: src/renderer/components/cluster-manager/clusters-menu.tsx:119 +#: src/renderer/components/cluster-manager/clusters-menu.tsx:121 msgid "new" msgstr "" @@ -2756,7 +2768,7 @@ msgstr "сек" msgid "singular" msgstr "" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:215 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:222 msgid "timestamps" msgstr "временные метки" @@ -2788,7 +2800,7 @@ msgstr "{0} всего, {1} доступно" msgid "{0} unavailable" msgstr "{0} недоступно" -#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:129 +#: src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx:128 msgid "{accountName} kubeconfig" msgstr "{accountName} конфигурация" @@ -2800,7 +2812,7 @@ msgstr "{allItemsCount, plural, one {# элемент} few {# элемента} msgid "{metricsRemainCount} more..." msgstr "{metricsRemainCount} еще…" -#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:240 +#: src/renderer/components/+workloads-pods/pod-logs-dialog.tsx:248 msgid "{podName} Logs" msgstr "{podName} логи" diff --git a/src/renderer/api/endpoints/pods.api.ts b/src/renderer/api/endpoints/pods.api.ts index c1394ab6db..6b7141d35f 100644 --- a/src/renderer/api/endpoints/pods.api.ts +++ b/src/renderer/api/endpoints/pods.api.ts @@ -46,6 +46,7 @@ export interface IPodLogsQuery { container?: string; tailLines?: number; timestamps?: boolean; + previous?: boolean; sinceTime?: string; // Date.toISOString()-format } diff --git a/src/renderer/components/+workloads-pods/pod-logs-dialog.tsx b/src/renderer/components/+workloads-pods/pod-logs-dialog.tsx index d7ff3863cc..7d948bd84d 100644 --- a/src/renderer/components/+workloads-pods/pod-logs-dialog.tsx +++ b/src/renderer/components/+workloads-pods/pod-logs-dialog.tsx @@ -53,6 +53,7 @@ export class PodLogsDialog extends React.Component { @observable logsReady = false; @observable selectedContainer: IPodContainer; @observable showTimestamps = true; + @observable showPrevious = false; @observable tailLines = 1000; lineOptions = [ @@ -67,6 +68,7 @@ export class PodLogsDialog extends React.Component { this.containers = pod.getContainers(); this.initContainers = pod.getInitContainers(); this.selectedContainer = container || this.containers[0]; + this.showPrevious = false; await this.load(); this.refresher.start(); } @@ -98,6 +100,7 @@ export class PodLogsDialog extends React.Component { timestamps: true, tailLines: this.tailLines ? this.tailLines : undefined, sinceTime: lastLogDate.toISOString(), + previous: this.showPrevious, }); if (!this.logs) { this.logs = logs; @@ -179,6 +182,11 @@ export class PodLogsDialog extends React.Component { this.showTimestamps = !this.showTimestamps; } + togglePrevious = () => { + this.showPrevious = !this.showPrevious; + this.reload(); + } + downloadLogs = () => { const { logs, newLogs } = this.getLogs(); const fileName = this.selectedContainer.name + ".log"; @@ -204,7 +212,7 @@ export class PodLogsDialog extends React.Component { } renderControlsPanel() { - const { logsReady, showTimestamps } = this; + const { logsReady, showTimestamps, showPrevious } = this; if (!logsReady) return; const timestamps = this.getTimestamps(this.logs + this.newLogs); let from = ""; @@ -225,6 +233,12 @@ export class PodLogsDialog extends React.Component { className={cssNames("timestamps-icon", { active: showTimestamps })} tooltip={(showTimestamps ? _i18n._(t`Hide`) : _i18n._(t`Show`)) + " " + _i18n._(t`timestamps`)} /> +