diff options
author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-06-11 17:04:50 -0400 |
---|---|---|
committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-06-11 17:04:50 -0400 |
commit | 666ae1c0efa1f02f3236ff7f49037c3e06b1eb83 (patch) | |
tree | a3efcb17f6daa52c8d809b4c5ad7044c0c482088 /jstests/free_mon | |
parent | 76fdcd76e8800afcbb57868fb98a7b6bcda6684c (diff) | |
download | mongo-666ae1c0efa1f02f3236ff7f49037c3e06b1eb83.tar.gz |
SERVER-34584 Update the default cloud free monitoring endpoint to final location
Diffstat (limited to 'jstests/free_mon')
-rw-r--r-- | jstests/free_mon/free_mon_announce.js | 5 | ||||
-rw-r--r-- | jstests/free_mon/libs/mock_http_server.py | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/jstests/free_mon/free_mon_announce.js b/jstests/free_mon/free_mon_announce.js index a2a10df8162..55b6a978917 100644 --- a/jstests/free_mon/free_mon_announce.js +++ b/jstests/free_mon/free_mon_announce.js @@ -17,7 +17,8 @@ load("jstests/free_mon/libs/free_mon.js"); function getConnectAnnounce() { // Capture message as it'd be presented to a user. clearRawMongoProgramOutput(); - const exitCode = runMongoProgram('mongo', '--port', mongod.port, '--eval', ';'); + const exitCode = runMongoProgram( + 'mongo', '--port', mongod.port, '--eval', "shellHelper( 'show', 'freeMonitoring' );"); assert.eq(exitCode, 0); return rawMongoProgramOutput(); } @@ -25,7 +26,7 @@ load("jstests/free_mon/libs/free_mon.js"); // state === 'enabled'. admin.enableFreeMonitoring(); WaitForRegistration(mongod); - const reminder = "Don't forget to check your metrics"; + const reminder = "To see your monitoring data"; assert.neq(getConnectAnnounce().search(reminder), -1, 'userReminder not found'); // Cleanup. diff --git a/jstests/free_mon/libs/mock_http_server.py b/jstests/free_mon/libs/mock_http_server.py index a6c0c7add66..ea5d0f21d08 100644 --- a/jstests/free_mon/libs/mock_http_server.py +++ b/jstests/free_mon/libs/mock_http_server.py @@ -124,7 +124,13 @@ class FreeMonHandler(http.server.BaseHTTPRequestHandler): 'informationalURL': 'http://www.example.com/123', 'message': 'Welcome to the Mock Free Monitoring Endpoint', 'reportingInterval': bson.int64.Int64(1), - 'userReminder': "Don't forget to check your metrics!", + 'userReminder': +"""To see your monitoring data, navigate to the unique URL below. +Anyone you share the URL with will also be able to view this page. + +https://localhost:8080/someUUID6v5jLKTIZZklDvN5L8sZ + +You can disable monitoring at any time by running db.disableFreeMonitoring().""", }) self._send_header() |