Skip to content

[Uptime] Add API functional tests for uptime graphQL #29128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinkambic merged 17 commits into from
Jan 25, 2019
Merged

[Uptime] Add API functional tests for uptime graphQL #29128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b99bb33
Add API functional tests for uptime graphQL.
justinkambic Jan 16, 2019
e4a314f
Merge branch '6.x' into uptime_functional-tests6.x
justinkambic Jan 23, 2019
8ecf0a9
Remove obsolete code.
justinkambic Jan 23, 2019
508a220
Merge branch '6.x' into uptime_functional-tests6.x
justinkambic Jan 23, 2019
67aaf9f
Add CI group for UI functional tests.
justinkambic Jan 23, 2019
7b71ac9
Delete obsolete code, rename heartbeat es archive.
justinkambic Jan 23, 2019
c19a35d
Refactor adapter methods.
justinkambic Jan 23, 2019
d9211e3
Refactor adapter methods.
justinkambic Jan 23, 2019
598a4bf
Attempt to fix ci-group tag error.
justinkambic Jan 23, 2019
8e2f1ac
Skip functional app tests until later PR.
justinkambic Jan 23, 2019
af8d429
Merge branch '6.x' into uptime_functional-tests6.x
justinkambic Jan 23, 2019
5a1e236
Remove unused code.
justinkambic Jan 23, 2019
21cccec
Merge branch '6.x' into uptime_functional-tests6.x
justinkambic Jan 24, 2019
6a3cb40
Optimize test runs.
justinkambic Jan 24, 2019
1d1116b
Add uptime to api test index.
justinkambic Jan 24, 2019
cc8e306
Fix formatting.
justinkambic Jan 24, 2019
b2ef4bb
Merge branch '6.x' into uptime_functional-tests6.x
justinkambic Jan 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions x-pack/plugins/uptime/common/graphql/introspection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,26 +137,6 @@
},
"defaultValue": null
},
{
"name": "downCount",
"description": "",
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
},
"defaultValue": null
},
{
"name": "windowSize",
"description": "",
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": { "kind": "SCALAR", "name": "Int", "ofType": null }
},
"defaultValue": null
},
{
"name": "filters",
"description": "",
Expand Down Expand Up @@ -1530,14 +1510,6 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "trouble",
"description": "",
"args": [],
"type": { "kind": "SCALAR", "name": "Int", "ofType": null },
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "total",
"description": "",
Expand Down
6 changes: 0 additions & 6 deletions x-pack/plugins/uptime/common/graphql/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,6 @@ export interface Snapshot {

down?: number | null;

trouble?: number | null;

total?: number | null;

histogram?: (HistogramSeries | null)[] | null;
Expand Down Expand Up @@ -411,10 +409,6 @@ export interface GetSnapshotQueryArgs {

dateRangeEnd: string;

downCount: number;

windowSize: number;

filters?: string | null;
}
export interface GetMonitorChartsDataQueryArgs {
Expand Down
14 changes: 9 additions & 5 deletions x-pack/plugins/uptime/public/components/queries/empty_state/get_doc_count.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@

import gql from 'graphql-tag';

export const getDocCountQuery = gql`
{
getDocCount {
count
}
export const getDocCountQueryString = `
{
getDocCount {
count
}
}
`;

export const getDocCountQuery = gql`
${getDocCountQueryString}
`;
6 changes: 3 additions & 3 deletions x-pack/plugins/uptime/public/components/queries/error_list/error_list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ interface ErrorListProps {
type Props = ErrorListProps & UptimeCommonProps;

export const ErrorList = ({
autorefreshInterval,
autorefreshIsPaused,
dateRangeStart,
dateRangeEnd,
filters,
autorefreshInterval,
autorefreshIsPaused,
}: Props) => (
<Query
pollInterval={autorefreshIsPaused ? undefined : autorefreshInterval}
query={getErrorListQuery}
variables={{ dateRangeStart, dateRangeEnd, filters }}
pollInterval={autorefreshIsPaused ? undefined : autorefreshInterval}
>
{({ loading, error, data }) => {
if (error) {
Expand Down
32 changes: 18 additions & 14 deletions x-pack/plugins/uptime/public/components/queries/error_list/get_error_list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@

import gql from 'graphql-tag';

export const getErrorListQuery = gql`
query ErrorList($dateRangeStart: String!, $dateRangeEnd: String!, $filters: String) {
errorList: getErrorsList(
dateRangeStart: $dateRangeStart
dateRangeEnd: $dateRangeEnd
filters: $filters
) {
latestMessage
monitorId
type
count
statusCode
timestamp
}
export const getErrorListQueryString = `
query ErrorList($dateRangeStart: String!, $dateRangeEnd: String!, $filters: String) {
errorList: getErrorsList(
dateRangeStart: $dateRangeStart
dateRangeEnd: $dateRangeEnd
filters: $filters
) {
latestMessage
monitorId
type
count
statusCode
timestamp
}
}
`;

export const getErrorListQuery = gql`
${getErrorListQueryString}
`;
18 changes: 14 additions & 4 deletions x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,18 @@ type Props = FilterBarProps & UptimeCommonProps;
const MAX_SELECTION_LENGTH = 20;
const SEARCH_THRESHOLD = 2;

export const FilterBar = ({ dateRangeEnd, dateRangeStart, updateQuery }: Props) => (
<Query query={getFilterBarQuery} variables={{ dateRangeStart, dateRangeEnd }}>
export const FilterBar = ({
autorefreshInterval,
autorefreshIsPaused,
dateRangeStart,
dateRangeEnd,
updateQuery,
}: Props) => (
<Query
pollInterval={autorefreshIsPaused ? undefined : autorefreshInterval}
query={getFilterBarQuery}
variables={{ dateRangeStart, dateRangeEnd }}
>
{({ loading, error, data }) => {
if (loading) {
return i18n.translate('xpack.uptime.filterBar.loadingMessage', {
Expand Down Expand Up @@ -57,10 +67,10 @@ export const FilterBar = ({ dateRangeEnd, dateRangeStart, updateQuery }: Props)
}),
},
{
value: i18n.translate('xpack.uptime.filterBar.filterDownLabel', {
value: 'down',
name: i18n.translate('xpack.uptime.filterBar.filterDownLabel', {
defaultMessage: 'Down',
}),
name: 'Down',
},
],
},
Expand Down
20 changes: 12 additions & 8 deletions x-pack/plugins/uptime/public/components/queries/filter_bar/get_filter_bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@

import gql from 'graphql-tag';

export const getFilterBarQuery = gql`
query FilterBar($dateRangeStart: String!, $dateRangeEnd: String!) {
filterBar: getFilterBar(dateRangeStart: $dateRangeStart, dateRangeEnd: $dateRangeEnd) {
status
port
id
scheme
}
export const getFilterBarQueryString = `
query FilterBar($dateRangeStart: String!, $dateRangeEnd: String!) {
filterBar: getFilterBar(dateRangeStart: $dateRangeStart, dateRangeEnd: $dateRangeEnd) {
status
port
id
scheme
}
}
`;

export const getFilterBarQuery = gql`
${getFilterBarQueryString}
`;
102 changes: 53 additions & 49 deletions x-pack/plugins/uptime/public/components/queries/monitor_charts/get_monitor_charts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,59 @@

import gql from 'graphql-tag';

export const createGetMonitorChartsQuery = gql`
query MonitorCharts($dateRangeStart: String!, $dateRangeEnd: String!, $monitorId: String!) {
monitorChartsData: getMonitorChartsData(
monitorId: $monitorId
dateRangeStart: $dateRangeStart
dateRangeEnd: $dateRangeEnd
) {
minDuration {
x
y
}
maxDuration {
x
y
}
maxContent {
x
y
}
maxResponse {
x
y
}
maxValidate {
x
y
}
maxTotal {
x
y
}
maxWriteRequest {
x
y
}
maxTcpRtt {
x
y
}
avgDuration {
x
y
}
status {
x
up
down
total
}
export const createGetMonitorChartsQueryString = `
query MonitorCharts($dateRangeStart: String!, $dateRangeEnd: String!, $monitorId: String!) {
monitorChartsData: getMonitorChartsData(
monitorId: $monitorId
dateRangeStart: $dateRangeStart
dateRangeEnd: $dateRangeEnd
) {
minDuration {
x
y
}
maxDuration {
x
y
}
maxContent {
x
y
}
maxResponse {
x
y
}
maxValidate {
x
y
}
maxTotal {
x
y
}
maxWriteRequest {
x
y
}
maxTcpRtt {
x
y
}
avgDuration {
x
y
}
status {
x
up
down
total
}
}
}
`;

export const createGetMonitorChartsQuery = gql`
${createGetMonitorChartsQueryString}
`;
6 changes: 5 additions & 1 deletion x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import gql from 'graphql-tag';

export const getMonitorListQuery = gql`
export const getMonitorListQueryString = `
query MonitorList($dateRangeStart: String!, $dateRangeEnd: String!, $filters: String) {
monitorStatus: getMonitors(
dateRangeStart: $dateRangeStart
Expand Down Expand Up @@ -42,3 +42,7 @@ export const getMonitorListQuery = gql`
}
}
`;

export const getMonitorListQuery = gql`
${getMonitorListQueryString}
`;
24 changes: 14 additions & 10 deletions x-pack/plugins/uptime/public/components/queries/monitor_select/get_latest_monitors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,20 @@

import gql from 'graphql-tag';

export const createGetLatestMonitorsQuery = gql`
query GetLatestMonitorQuery($dateRangeStart: String!, $dateRangeEnd: String!) {
latestMonitors: getLatestMonitors(
dateRangeStart: $dateRangeStart
dateRangeEnd: $dateRangeEnd
) {
monitor {
status
id
}
export const getLatestMonitorsQueryString = `
query GetLatestMonitorQuery($dateRangeStart: String!, $dateRangeEnd: String!) {
latestMonitors: getLatestMonitors(
dateRangeStart: $dateRangeStart
dateRangeEnd: $dateRangeEnd
) {
monitor {
status
id
}
}
}
`;

export const getLatestMonitorsQuery = gql`
${getLatestMonitorsQueryString}
`;
4 changes: 2 additions & 2 deletions x-pack/plugins/uptime/public/components/queries/monitor_select/monitor_select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import React, { Fragment } from 'react';
import { Query } from 'react-apollo';
import { Monitor } from '../../../../common/graphql/types';
import { UptimeCommonProps } from '../../../uptime_app';
import { createGetLatestMonitorsQuery } from './get_latest_monitors';
import { getLatestMonitorsQuery } from './get_latest_monitors';

interface MonitorSelectProps {
valueOfSelectedMonitor?: string;
Expand All @@ -30,7 +30,7 @@ export const MonitorSelect = ({
}: Props) => (
<Query
pollInterval={autorefreshIsPaused ? undefined : autorefreshInterval}
query={createGetLatestMonitorsQuery}
query={getLatestMonitorsQuery}
variables={{ dateRangeStart, dateRangeEnd }}
>
{({ loading, error, data }) => {
Expand Down
Loading