From 13df88c15e5e87e1c00e9364a6f17cdafe6b5628 Mon Sep 17 00:00:00 2001
From: Deniz Kusefoglu <deniz@influxdata.com>
Date: Fri, 13 Dec 2019 12:59:48 -0800
Subject: [PATCH] chore(ui): Remove eventMarkers feature flag (#16216)

---
 ui/src/shared/components/TimeSeries.tsx | 3 +--
 ui/src/shared/utils/featureFlag.ts      | 2 --
 ui/src/timeMachine/actions/queries.ts   | 3 +--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ui/src/shared/components/TimeSeries.tsx b/ui/src/shared/components/TimeSeries.tsx
index 75258830a9..1c753a9f98 100644
--- a/ui/src/shared/components/TimeSeries.tsx
+++ b/ui/src/shared/components/TimeSeries.tsx
@@ -17,7 +17,6 @@ import {runStatusesQuery} from 'src/alerting/utils/statusEvents'
 import {checkQueryResult} from 'src/shared/utils/checkQueryResult'
 import {getWindowVars} from 'src/variables/utils/getWindowVars'
 import {buildVarsOption} from 'src/variables/utils/buildVarsOption'
-import {isFlagEnabled} from 'src/shared/utils/featureFlag'
 import 'intersection-observer'
 
 // Constants
@@ -188,7 +187,7 @@ class TimeSeries extends Component<Props & WithRouterProps, State> {
       const results = await Promise.all(this.pendingResults.map(r => r.promise))
 
       let statuses = [] as StatusRow[][]
-      if (check && isFlagEnabled('eventMarkers')) {
+      if (check) {
         const extern = buildVarsOption(variables)
         this.pendingCheckStatuses = runStatusesQuery(orgID, check.id, extern)
         statuses = await this.pendingCheckStatuses.promise // TODO handle errors
diff --git a/ui/src/shared/utils/featureFlag.ts b/ui/src/shared/utils/featureFlag.ts
index b122cfb566..359696099b 100644
--- a/ui/src/shared/utils/featureFlag.ts
+++ b/ui/src/shared/utils/featureFlag.ts
@@ -3,7 +3,6 @@ import {CLOUD, CLOUD_BILLING_VISIBLE} from 'src/shared/constants'
 
 const OSS_FLAGS = {
   alerting: false,
-  eventMarkers: false,
   deleteWithPredicate: false,
   monacoEditor: false,
   downloadCellCSV: false,
@@ -12,7 +11,6 @@ const OSS_FLAGS = {
 
 const CLOUD_FLAGS = {
   alerting: true,
-  eventMarkers: false,
   deleteWithPredicate: false,
   monacoEditor: false,
   cloudBilling: CLOUD_BILLING_VISIBLE, // should be visible in dev and acceptance, but not in cloud
diff --git a/ui/src/timeMachine/actions/queries.ts b/ui/src/timeMachine/actions/queries.ts
index 2f1c42a520..d0d7dfd833 100644
--- a/ui/src/timeMachine/actions/queries.ts
+++ b/ui/src/timeMachine/actions/queries.ts
@@ -34,7 +34,6 @@ import {
 } from 'src/variables/selectors'
 import {getWindowVars} from 'src/variables/utils/getWindowVars'
 import {buildVarsOption} from 'src/variables/utils/buildVarsOption'
-import {isFlagEnabled} from 'src/shared/utils/featureFlag'
 
 // Types
 import {CancelBox} from 'src/types/promises'
@@ -145,7 +144,7 @@ export const executeQueries = (dashboardID?: string) => async (
     const duration = Date.now() - startTime
 
     let statuses = [[]] as StatusRow[][]
-    if (check && isFlagEnabled('eventMarkers')) {
+    if (check) {
       const extern = buildVarsOption(variableAssignments)
       pendingCheckStatuses = runStatusesQuery(orgID, check.id, extern)
       statuses = await pendingCheckStatuses.promise // TODO handle errors