chore(ui): Remove eventMarkers feature flag (#16216)

pull/15558/head
Deniz Kusefoglu 2019-12-13 12:59:48 -08:00 committed by GitHub
parent 961875e0eb
commit 13df88c15e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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