Merge pull request #4889 from kyoto/monitoring-create-silence-default…

…-creator Monitoring: User user's username as default silence creator value
openshift · Apr 3, 2020 · 8673440 · 8673440
2 parents 6ea4248 + 0a3ab58
commit 8673440
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/frontend/public/components/monitoring.tsx b/frontend/public/components/monitoring.tsx
@@ -1459,14 +1459,18 @@ const EditSilence = connect(silenceParamToProps)(({ loaded, loadError, silence }
   );
 });
 
-const CreateSilence = () => {
+const CreateSilence_ = ({ createdBy }) => {
   const matchers = _.map(getURLSearchParams(), (value, name) => ({ name, value, isRegex: false }));
   return _.isEmpty(matchers) ? (
-    <SilenceForm saveButtonText="Create" title="Create Silence" />
+    <SilenceForm defaults={{ createdBy }} saveButtonText="Create" title="Create Silence" />
   ) : (
-    <SilenceForm defaults={{ matchers }} saveButtonText="Create" title="Silence Alert" />
+    <SilenceForm defaults={{ createdBy, matchers }} saveButtonText="Create" title="Silence Alert" />
   );
 };
+const createSilenceStateToProps = ({ UI }: RootState) => ({
+  createdBy: UI.get('user')?.metadata?.name,
+});
+const CreateSilence = connect(createSilenceStateToProps)(CreateSilence_);
 
 const AlertmanagerYAML = () => {
   return (