From 0314efc6bdbc18f9179431177a63e9c4e3a9e0f5 Mon Sep 17 00:00:00 2001
From: Jimmy Kuang <jimmy@elastic.co>
Date: Thu, 30 Jan 2020 09:16:04 -0800
Subject: [PATCH] [ILM] Index Lifecycle Policies show wrong unit in Kibana UI
 (#55228) (#55758)

* Added timing and byte size units to hot, cold, warm, and delete phase

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../components/hot_phase/hot_phase.js         | 63 +++++++++++++++++++
 .../edit_policy/components/min_age_input.js   | 58 +++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
index d57bf759ad721..475d26bb2e3c0 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
@@ -169,6 +169,30 @@ export class HotPhase extends PureComponent {
                             defaultMessage: 'megabytes',
                           }),
                         },
+                        {
+                          value: 'b',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.bytesLabel', {
+                            defaultMessage: 'bytes',
+                          }),
+                        },
+                        {
+                          value: 'kb',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.kilobytesLabel', {
+                            defaultMessage: 'kilobytes',
+                          }),
+                        },
+                        {
+                          value: 'tb',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.terabytesLabel', {
+                            defaultMessage: 'terabytes',
+                          }),
+                        },
+                        {
+                          value: 'pb',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.petabytesLabel', {
+                            defaultMessage: 'petabytes',
+                          }),
+                        },
                       ]}
                     />
                   </ErrableFormRow>
@@ -254,6 +278,45 @@ export class HotPhase extends PureComponent {
                             defaultMessage: 'hours',
                           }),
                         },
+                        {
+                          value: 'm',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.minutesLabel', {
+                            defaultMessage: 'minutes',
+                          }),
+                        },
+                        {
+                          value: 's',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.secondsLabel', {
+                            defaultMessage: 'seconds',
+                          }),
+                        },
+                        {
+                          value: 'ms',
+                          text: i18n.translate(
+                            'xpack.indexLifecycleMgmt.hotPhase.millisecondsLabel',
+                            {
+                              defaultMessage: 'milliseconds',
+                            }
+                          ),
+                        },
+                        {
+                          value: 'micros',
+                          text: i18n.translate(
+                            'xpack.indexLifecycleMgmt.hotPhase.microsecondsLabel',
+                            {
+                              defaultMessage: 'microseconds',
+                            }
+                          ),
+                        },
+                        {
+                          value: 'nanos',
+                          text: i18n.translate(
+                            'xpack.indexLifecycleMgmt.hotPhase.nanosecondsLabel',
+                            {
+                              defaultMessage: 'nanoseconds',
+                            }
+                          ),
+                        },
                       ]}
                     />
                   </ErrableFormRow>
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js
index b4c9f4e958cd2..2300979851329 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js
@@ -73,6 +73,11 @@ export const MinAgeInput = props => {
 
   let daysOptionLabel;
   let hoursOptionLabel;
+  let minutesOptionLabel;
+  let secondsOptionLabel;
+  let millisecondsOptionLabel;
+  let microsecondsOptionLabel;
+  let nanosecondsOptionLabel;
 
   if (rolloverEnabled) {
     daysOptionLabel = i18n.translate(
@@ -88,6 +93,39 @@ export const MinAgeInput = props => {
         defaultMessage: 'hours from rollover',
       }
     );
+    minutesOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverMinutesOptionLabel',
+      {
+        defaultMessage: 'minutes from rollover',
+      }
+    );
+
+    secondsOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverSecondsOptionLabel',
+      {
+        defaultMessage: 'seconds from rollover',
+      }
+    );
+    millisecondsOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverMilliSecondsOptionLabel',
+      {
+        defaultMessage: 'milliseconds from rollover',
+      }
+    );
+
+    microsecondsOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverMicroSecondsOptionLabel',
+      {
+        defaultMessage: 'microseconds from rollover',
+      }
+    );
+
+    nanosecondsOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverNanoSecondsOptionLabel',
+      {
+        defaultMessage: 'nanoseconds from rollover',
+      }
+    );
   } else {
     daysOptionLabel = i18n.translate(
       'xpack.indexLifecycleMgmt.editPolicy.creationDaysOptionLabel',
@@ -150,6 +188,26 @@ export const MinAgeInput = props => {
                 value: 'h',
                 text: hoursOptionLabel,
               },
+              {
+                value: 'm',
+                text: minutesOptionLabel,
+              },
+              {
+                value: 's',
+                text: secondsOptionLabel,
+              },
+              {
+                value: 'ms',
+                text: millisecondsOptionLabel,
+              },
+              {
+                value: 'micros',
+                text: microsecondsOptionLabel,
+              },
+              {
+                value: 'nanos',
+                text: nanosecondsOptionLabel,
+              },
             ]}
           />
         </EuiFormRow>