diff options
author | George Moschovitis <george.moschovitis@gmail.com> | 2019-01-28 12:27:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-28 12:27:42 +0200 |
commit | b6ce8175451c70db785f36f31b1d26c23f9f6979 (patch) | |
tree | 8e789a92062d1411a1780be52db88fd47cd8c89e /health | |
parent | afe8af3372eaa6862207ad3b769b5f5c7355e21c (diff) |
Cloud Sign-In (#5095)
* Manually merged changes from old hub-support branch, tracking #131
Call claim url #4771
Claim ui improvements #4771
Cleanup
Implement Sign Out
Introduced sign-in modal #3990
Added sign-in button
More work on the iframe trick
More work
More work on the logic, removed old obsolete stuff
Close modal
Implement account menu
Minor rename
Renamed my-netdata to My Agents
Show migrate button
Collect known agents
Work on migrateRegistryDidClick
Minor
Actually show agents from netdata cloud in the menu
Some cleanup
Keep all the alternate_urls for each agent
Fix for tooltips over SignIn/AccountMenu
* Actually use NETDATA.registry.cloudBaseURL
Tricky!
* Hide switch identity when signed-in #153
* Manually merged changes from old hub-support branch, tracking #131
Call claim url #4771
Claim ui improvements #4771
Cleanup
Implement Sign Out
Introduced sign-in modal #3990
Added sign-in button
More work on the iframe trick
More work
More work on the logic, removed old obsolete stuff
Close modal
Implement account menu
Minor rename
Renamed my-netdata to My Agents
Show migrate button
Collect known agents
Work on migrateRegistryDidClick
Minor
Actually show agents from netdata cloud in the menu
Some cleanup
Keep all the alternate_urls for each agent
Fix for tooltips over SignIn/AccountMenu
* Actually use NETDATA.registry.cloudBaseURL
Tricky!
* Hide switch identity when signed-in #153
* Cleanup
* Refresh menu on sign-in
* Disable cloud functionality if cloud base url is not set.
This wll allow the merging of the branch into master, so we can avoid nasty rebases.
* Updated to use the latest API endpoints
* Fixed a couple of LGTM warnings
* Improved migration algorithm, some cleanup.
* Update My-Netdata menu on sign-out
* Minor
* Replaced modal with window
* Update the My-Agents menu after migration, cleanup
* Make the agent work after switching cloudBaseURL, cleanup
* Introduced event tracing for analytics
* Minor
* Removed GA
* Fixed error reported by LGTM
* Only send the diff when syncing agents to ameliorate the load on the backend, cleanup
* Reverted My-Netdata name, added some logging
* Add Netdata Cloud menu item
* Minor
* Use the merge: false option and a fix
* Added loading message in my-netdata menu
* Show error if we cannot connect to netdata.cloud
* Minor
* Implemented deleteCloudKnownAgentURL api call, use it in my-netdata menu.
* Removed menu entry
* Disable my-netdata menu if user is not signed-in and using the global registry
* Stop accessing the registry if it's not used.
* Mask the agent url if the registry is in 'disabled' mode
* Filter masked urls
* Improved filtering of masked urls
* Try to eagerly initialize the account ui to improve perceived performance
* Minor
* Don't search for other people's urls in cloud-enabled mode.
* Added basic my-netdata filtering
* Filter streamed host, aesthetic fixes
* Minor
* Some improvements of the filter ui
* Removed What is this
* Added placeholder to input, other fixes #240
* Show message if no databases match filter criteria
* Fixed bug where agent lists where not merged
* Minor
* Hide modal if it redirects to self.
* autocomplete off for filter input
* Enable delete for custom registries, don't show error if delete fails
* Filter agents without urls
* Fix LGTM warning
* Minor
* Concatenate at client side, used the faster merge: false path
* Added a clear button to the filter for extra usability
* Minor
* Minor
* Improvements for small screens (more needed)
* Combined my-netdata menu and hostname
* Re-enabled registry masking
* Show agent-filter only when signed-in
* Improved syncAgents
* Don't mask if using custom registry
* Reject agents with empty urls
* Filter valid agents
* Fixed a couple of bugs
* Applied Chris' fixes
* Fix in registry.c
* Cleanup
* Only sync once
* Implemented forceSync
* Added what is this
* sso, wip
* Working SSO sign-in/sign-out, cleanup
* Added Chris' patch
* Added a modal that explains what synchronize is doing
* Use sso-agent
* Use origin as query param in sign-in
* iframe -> origin
* Pass machine_guid to sso
* Make sure that the current netdata agent is synchronized hub#262
* Normalize originURL
* Reenable tryFastInitCloud()
* Updated to the latest endpoints
* Support synchronizing to multiple cloud accounts
* Set default cloud base url to netdata.cloud
* Fix filter issues with Firefox
* Fix for double tooltip on sign-in
* Show known servers in console for debugging purposes
* Don't block on errors to delete from registry when signed in
* Disable tryFastInitCloud
* Improved styling for filter input
* Improved styling in my-netdata menu
* Display the registry url in the sync-registry modal
* agents -> nodes in texts
* Support for sso-precheck
* Do not implicitly synchronize custom registries.
* Improvement to syncAgents (more coming)
* More fixes
* Don't sign in users with private registries if they don't consent on the sync
* Set netdataRegistryAfterMs = 0
* Don't pass url to sso-agent
* Added Chris' patch to alarm-notify
* Refactored syncAgent/mergeAgents, make sure current Agent is synced on sign-in.
* Fix for LGTM warning
* Minor
* Fix for a XSS warning
* Extra check for dataLayer
Diffstat (limited to 'health')
-rwxr-xr-x | health/notifications/alarm-notify.sh.in | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in index 9fca62711a..b96ab52f79 100755 --- a/health/notifications/alarm-notify.sh.in +++ b/health/notifications/alarm-notify.sh.in @@ -1809,7 +1809,27 @@ urlencode "${args_host}" >/dev/null; url_host="${REPLY}" urlencode "${chart}" >/dev/null; url_chart="${REPLY}" urlencode "${family}" >/dev/null; url_family="${REPLY}" urlencode "${name}" >/dev/null; url_name="${REPLY}" -goto_url="${NETDATA_REGISTRY_URL}/goto-host-from-alarm.html?host=${url_host}&chart=${url_chart}&family=${url_family}&alarm=${url_name}&alarm_unique_id=${unique_id}&alarm_id=${alarm_id}&alarm_event_id=${event_id}" + +redirect_params="host=${url_host}&chart=${url_chart}&family=${url_family}&alarm=${url_name}&alarm_unique_id=${unique_id}&alarm_id=${alarm_id}&alarm_event_id=${event_id}" +GOTOCLOUD=0 + +if [ "${NETDATA_REGISTRY_URL}" == "https://registry.my-netdata.io" ] ; then + if [ -z "${NETDATA_REGISTRY_UNIQUE_ID}" ] ; then + if [ -f "@registrydir_POST@/netdata.public.unique.id" ]; then + NETDATA_REGISTRY_UNIQUE_ID="$(cat "@registrydir_POST@/netdata.public.unique.id")" + fi + fi + if [ ! -z "${NETDATA_REGISTRY_UNIQUE_ID}" ] ; then + GOTOCLOUD=1 + fi +fi + +if [ ${GOTOCLOUD} -eq 0 ] ; then + goto_url="${NETDATA_REGISTRY_URL}/goto-host-from-alarm.html?${redirect_params}" +else + urlencode "${NETDATA_REGISTRY_URL}/goto-host-from-alarm.html" >/dev/null; url_registrypath="${REPLY}" + goto_url="https://netdata.cloud/alarms/redirect?agentID=${NETDATA_REGISTRY_UNIQUE_ID}®istrypath=${url_registrypath}&${redirect_params}" +fi # the severity of the alarm severity="${status}" |