Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7528a30
Added monitors for cbioportal
cawohnjing Nov 14, 2025
206dd5d
Changed the validation word fro cbioportal
cawohnjing Nov 17, 2025
e7d014e
Changed the validation word for cbioportal
cawohnjing Nov 17, 2025
a423ad9
Changed the validation word for cbioportal
cawohnjing Nov 17, 2025
a86c312
Reverted cbioportal changes
cawohnjing Nov 17, 2025
7888f03
Changed the validation for cbioportal dev
cawohnjing Nov 18, 2025
0d2fe11
changed the validation text for cbioportal dev
cawohnjing Nov 18, 2025
0bb1f06
Added script validator for cbio dev frontend
cawohnjing Nov 20, 2025
19f681f
cbioportal dev fixes
cawohnjing Nov 21, 2025
a3cba63
cbioportal dev update
cawohnjing Nov 21, 2025
516553a
cbioportal dev fix
cawohnjing Nov 21, 2025
01ace5e
cbioportal dev fix
cawohnjing Nov 25, 2025
d892770
Added scripted monitor for cbio dev and qa content site
cawohnjing Nov 26, 2025
4d66cab
Fix syntax error for cbio dev and qa
cawohnjing Nov 26, 2025
1f2986d
Added scripted browser monitor file
cawohnjing Dec 22, 2025
9534b18
Merge branch 'main' into cbioportal-synthetic-monitors
cawohnjing Dec 22, 2025
035d01e
Added script for scripted browser for cbioportal
cawohnjing Dec 23, 2025
b539271
Improved code quality
cawohnjing Dec 23, 2025
d2e0aad
Minor fixes
cawohnjing Dec 30, 2025
dd40e62
Updated the branch in jenkins file
cawohnjing Dec 30, 2025
fc4f869
Reverted scripted browser change
cawohnjing Dec 30, 2025
9cd5ef9
Fixed typo and removed comments
cawohnjing Dec 31, 2025
d18cb92
Reverted the branch in jenkins file
cawohnjing Dec 31, 2025
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
200 changes: 195 additions & 5 deletions monitoring/FNL-Monitoring-List.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Project_Name,Project_Acronym,Program,Tier,Endpoint_Name,URL,Endpoint_Query,Validation_Text,Private_Location,Slack_Channel,Alert_Email,Monitored_Resources
Project_Name,Project_Acronym,Program,Tier,Endpoint_Name,URL,Endpoint_Query,Validation_Text,Private_Location,Slack_Channel,Alert_Email,Monitored_Resources,Browser_Query
Clinical Trial Data Commons,ctdc,CRDC,Dev,Portal,https://clinical-dev.datacommons.cancer.gov,,,TRUE,C051XGDRQG6,,opensearch
Clinical Trial Data Commons,ctdc,CRDC,Dev,API,https://clinical-dev.datacommons.cancer.gov/v1/graphql,"var assert = require('assert');

Expand Down Expand Up @@ -737,8 +737,35 @@ $http.post('https://populationsciences-qa.datacommons.cancer.gov/v1/graphql/',

}
);",,TRUE,C07E28M8R7T,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Dev,Portal,https://cbioportal-dev.ccdi.cancer.gov,,cBioPortal,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Dev,Content,https://cbioportal-dev-content.ccdi.cancer.gov,,,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Dev,Portal,https://cbioportal-dev.ccdi.cancer.gov,,Datasets,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Dev,Content,https://cbioportal-dev-content.ccdi.cancer.gov,,,TRUE,C09KQ60AGRY,,,"const assert = require('assert');

const CONFIG = {
URL: 'https://cbioportal-dev-content.ccdi.cancer.gov/',
XPATH: ""//h2[contains(text(), 'Visualization')]"",
EXPECTED_TEXT: 'visualization'
};

async function runMonitor() {
console.log(`Starting monitor for: ${CONFIG.URL}`);
await $browser.get(CONFIG.URL);

console.log(`Waiting for element: ${CONFIG.XPATH}`);
const element = await $browser.waitForAndFindElement($driver.By.xpath(CONFIG.XPATH), 20000);

const actualText = await element.getText();
console.log(`Found text: ${actualText}`);

assert.ok(
actualText.toLowerCase().includes(CONFIG.EXPECTED_TEXT),
`Verification Failed: Expected ${CONFIG.EXPECTED_TEXT} but found ${actualText}`
);
}

runMonitor().catch(err => {
console.error('Monitor Failed:', err.message);
throw err;
});"
cBioPortal for Cancer Genomics,cbioportal,CCDI,Dev,About,https://cbioportal-dev-about.ccdi.cancer.gov,"var assert = require('assert');

$http.get('https://cbioportal-dev-about.ccdi.cancer.gov/version.json',
Expand Down Expand Up @@ -777,8 +804,35 @@ $http.get('https://cbioportal-api-dev.ccdi.cancer.gov/api/cancer-types',
assert.ok('cancerTypeId' in firstObj, 'Expected object to have cancerTypeId key');
}
);",,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Qa,Portal,https://cbioportal-qa.ccdi.cancer.gov,,cBioPortal,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Qa,Content,https://cbioportal-qa-content.ccdi.cancer.gov,,,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Qa,Portal,https://cbioportal-qa.ccdi.cancer.gov,,Datasets,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Qa,Content,https://cbioportal-qa-content.ccdi.cancer.gov,,,TRUE,C09KQ60AGRY,,,"const assert = require('assert');

const CONFIG = {
URL: 'https://cbioportal-qa-content.ccdi.cancer.gov/',
XPATH: ""//h2[contains(text(), 'Visualization')]"",
EXPECTED_TEXT: 'visualization'
};

async function runMonitor() {
console.log(`Starting monitor for: ${CONFIG.URL}`);
await $browser.get(CONFIG.URL);

console.log(`Waiting for element: ${CONFIG.XPATH}`);
const element = await $browser.waitForAndFindElement($driver.By.xpath(CONFIG.XPATH), 20000);

const actualText = await element.getText();
console.log(`Found text: ${actualText}`);

assert.ok(
actualText.toLowerCase().includes(CONFIG.EXPECTED_TEXT),
`Verification Failed: Expected ${CONFIG.EXPECTED_TEXT} but found ${actualText}`
);
}

runMonitor().catch(err => {
console.error('Monitor Failed:', err.message);
throw err;
});"
cBioPortal for Cancer Genomics,cbioportal,CCDI,Qa,About,https://cbioportal-qa-about.ccdi.cancer.gov,"var assert = require('assert');

$http.get('https://cbioportal-qa-about.ccdi.cancer.gov/version.json',
Expand Down Expand Up @@ -818,6 +872,142 @@ $http.get('https://cbioportal-api-qa.ccdi.cancer.gov/api/cancer-types',

}
);",,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Stage,Portal,https://cbioportal-stage.ccdi.cancer.gov,,Datasets,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Stage,Content,https://cbioportal-stage-content.ccdi.cancer.gov,,,TRUE,C09KQ60AGRY,,,"const assert = require('assert');

const CONFIG = {
URL: 'https://cbioportal-stage-content.ccdi.cancer.gov/',
XPATH: ""//h2[contains(text(), 'Visualization')]"",
EXPECTED_TEXT: 'visualization'
};

async function runMonitor() {
console.log(`Starting monitor for: ${CONFIG.URL}`);
await $browser.get(CONFIG.URL);

console.log(`Waiting for element: ${CONFIG.XPATH}`);
const element = await $browser.waitForAndFindElement($driver.By.xpath(CONFIG.XPATH), 20000);

const actualText = await element.getText();
console.log(`Found text: ${actualText}`);

assert.ok(
actualText.toLowerCase().includes(CONFIG.EXPECTED_TEXT),
`Verification Failed: Expected ${CONFIG.EXPECTED_TEXT} but found ${actualText}`
);
}

runMonitor().catch(err => {
console.error('Monitor Failed:', err.message);
throw err;
});"
cBioPortal for Cancer Genomics,cbioportal,CCDI,Stage,About,https://cbioportal-stage-about.ccdi.cancer.gov,"var assert = require('assert');

$http.get('https://cbioportal-stage-about.ccdi.cancer.gov/version.json',

function (err, response, body) {

if (err) {
throw new Error(err);
}

console.log('Response:', body);
console.log('Response:', response.statusCode);

assert.equal(response.statusCode, 200, 'Expected a 200 OK response.');

assert.ok('version' in body, 'Expected object to have version key');
}
);",,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Stage,API,https://cbioportal-api-stage.ccdi.cancer.gov,"var assert = require('assert');

$http.get('https://cbioportal-api-stage.ccdi.cancer.gov/api/cancer-types',

function (err, response, body) {

if (err) {
throw new Error(err);
}

console.log('Response:', body);
console.log('Response:', response.statusCode);

assert.equal(response.statusCode, 200, 'Expected a 200 OK response.');
assert.ok(Array.isArray(body), 'Expected response body to be an array.');

const firstObj = body[0];
assert.ok('cancerTypeId' in firstObj, 'Expected object to have cancerTypeId key');

}
);",,TRUE,C09KQ60AGRY,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Prod,Portal,https://cbioportal.ccdi.cancer.gov,,Datasets,TRUE,C09TVCQB108,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Prod,Content,https://cbioportal-content.ccdi.cancer.gov,,,TRUE,C09TVCQB108,,,"const assert = require('assert');

const CONFIG = {
URL: 'https://cbioportal-content.ccdi.cancer.gov/',
XPATH: ""//h2[contains(text(), 'Visualization')]"",
EXPECTED_TEXT: 'visualization'
};

async function runMonitor() {
console.log(`Starting monitor for: ${CONFIG.URL}`);
await $browser.get(CONFIG.URL);

console.log(`Waiting for element: ${CONFIG.XPATH}`);
const element = await $browser.waitForAndFindElement($driver.By.xpath(CONFIG.XPATH), 20000);

const actualText = await element.getText();
console.log(`Found text: ${actualText}`);

assert.ok(
actualText.toLowerCase().includes(CONFIG.EXPECTED_TEXT),
`Verification Failed: Expected ${CONFIG.EXPECTED_TEXT} but found ${actualText}`
);
}

runMonitor().catch(err => {
console.error('Monitor Failed:', err.message);
throw err;
});"
cBioPortal for Cancer Genomics,cbioportal,CCDI,Prod,About,https://cbioportal-about.ccdi.cancer.gov,"var assert = require('assert');

$http.get('https://cbioportal-about.ccdi.cancer.gov/version.json',

function (err, response, body) {

if (err) {
throw new Error(err);
}

console.log('Response:', body);
console.log('Response:', response.statusCode);

assert.equal(response.statusCode, 200, 'Expected a 200 OK response.');

assert.ok('version' in body, 'Expected object to have version key');
}
);",,TRUE,C09TVCQB108,,
cBioPortal for Cancer Genomics,cbioportal,CCDI,Prod,API,https://cbioportal-api.ccdi.cancer.gov,"var assert = require('assert');

$http.get('https://cbioportal-api.ccdi.cancer.gov/api/cancer-types',

function (err, response, body) {

if (err) {
throw new Error(err);
}

console.log('Response:', body);
console.log('Response:', response.statusCode);

assert.equal(response.statusCode, 200, 'Expected a 200 OK response.');
assert.ok(Array.isArray(body), 'Expected response body to be an array.');

const firstObj = body[0];
assert.ok('cancerTypeId' in firstObj, 'Expected object to have cancerTypeId key');

}
);",,TRUE,C09TVCQB108,,
Cancer Data Aggregator,CDA,CRDC,Dev,API,https://cda-dev.datacommons.cancer.gov/,"var assert = require('assert');

$http.get('https://cda-dev.datacommons.cancer.gov/columns/',
Expand Down
5 changes: 4 additions & 1 deletion monitoring/scripts/monitor_update_csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import sys, getopt, json, os, csv, codecs, requests, contextlib
from monitors.alerts.policies import set_fargate_policy, set_alb_policy, set_opensearch_policy, set_synthetics_policy
from monitors.synthetics import set_synthetics_monitor_simple_browser, set_synthetics_monitor_scripted_api, set_synthetics_monitor_cert_expiration
from monitors.synthetics import set_synthetics_monitor_simple_browser, set_synthetics_monitor_scripted_api, set_synthetics_monitor_scripted_browser, set_synthetics_monitor_cert_expiration
from monitors.alerts.destinations import set_email_destination, set_slack_destination
from monitors.alerts.workflows import set_workflow

Expand Down Expand Up @@ -132,10 +132,13 @@ def setSynthetics(input_url, policyList):
api = json.loads(json.dumps(api_data))
api.update({"location": row["Private_Location"]})
api.update({"query": row["Endpoint_Query"]})
api.update({"browser_query": row["Browser_Query"]})
api.update({"text": row["Validation_Text"]})

if api['query']:
set_synthetics_monitor_scripted_api.setsyntheticsmonitor(project, tier, key, api, synthetics_policy_id)
elif api['browser_query']:
set_synthetics_monitor_scripted_browser.setSyntheticsMonitor(project, tier, key, api, synthetics_policy_id)
elif tier.lower() == 'prod' and api['name'].lower() == 'portal':
set_synthetics_monitor_simple_browser.setsyntheticsmonitor(project, tier, key, api, synthetics_policy_id)
set_synthetics_monitor_cert_expiration.setsyntheticsmonitor(project, tier, key, api, synthetics_policy_id)
Expand Down
Loading
Loading