diff --git a/alertnow/assets/dashboards/alertnow_overview.json b/alertnow/assets/dashboards/alertnow_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/backstage/assets/dashboards/backstage_overview.json b/backstage/assets/dashboards/backstage_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/cortex/assets/dashboards/cortex_overview.json b/cortex/assets/dashboards/cortex_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/docontrol/assets/dashboards/docontrol_overview.json b/docontrol/assets/dashboards/docontrol_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/exim/assets/dashboards/exim_overview.json b/exim/assets/dashboards/exim_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/fluentbit/assets/dashboards/fluent_bit_overview.json b/fluentbit/assets/dashboards/fluent_bit_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/fluxcd/assets/dashboards/fluxcd_overview.json b/fluxcd/assets/dashboards/fluxcd_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/go_pprof_scraper/assets/dashboards/go_pprof_scraper_overview.json b/go_pprof_scraper/assets/dashboards/go_pprof_scraper_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/grpc_check/assets/dashboards/grpc_check_overview.json b/grpc_check/assets/dashboards/grpc_check_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/hikaricp/assets/dashboards/hikaricp_overview.json b/hikaricp/assets/dashboards/hikaricp_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/lightstep_incident_response/assets/dashboards/lightstep_incident_response_overview.json b/lightstep_incident_response/assets/dashboards/lightstep_incident_response_overview.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/n2ws/assets/dashboards/N2WSBackup&Recovery-EntitiesSpecificDashboard.json b/n2ws/assets/dashboards/N2WSBackup&Recovery-EntitiesSpecificDashboard.json
deleted file mode 100644
index bcf4870864..0000000000
--- a/n2ws/assets/dashboards/N2WSBackup&Recovery-EntitiesSpecificDashboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{"title":"N2WS Backup & Recovery - Entity Types Details","description":"## N2WS Backup & Recovery - Detailed Dashboard by Entity Type \n\nThis dashboard summarizes data that was collected from all N2WS Backup & Recovery hosts that are connected to DataDog, giving more details about entities types","widgets":[{"id":6833713613288876,"layout":{"x":13,"y":0,"width":24,"height":6},"definition":{"type":"free_text","text":"N2WS Backup & Recovery  Servers Status","color":"#2B13E6","font_size":"56","text_align":"left"}},{"id":4085517614690048,"layout":{"x":0,"y":0,"width":12,"height":7},"definition":{"type":"image","url":"https://n2ws.com/wp-content/uploads/2018/10/N2WS_Logo-Primary-2.svg","sizing":"fit"}},{"id":3059142389457708,"layout":{"x":0,"y":53,"width":10,"height":6},"definition":{"title":"Instances","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_instances_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4931723730478434,"layout":{"x":11,"y":67,"width":11,"height":6},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":2428912746970058,"layout":{"x":23,"y":60,"width":11,"height":6},"definition":{"title":"Redshift","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_redshift_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6882875583965308,"layout":{"x":23,"y":53,"width":11,"height":6},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_db_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":1705799585091706,"layout":{"x":11,"y":53,"width":11,"height":6},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_volumes_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":2}},{"id":1828199094188556,"layout":{"x":11,"y":60,"width":11,"height":6},"definition":{"title":"Dynamo DB","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_ddb_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":5138781865653636,"layout":{"x":0,"y":60,"width":10,"height":6},"definition":{"title":"Aurora","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_clus_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":5429842537420874,"layout":{"x":58,"y":60,"width":10,"height":6},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":2150896737699084,"layout":{"x":47,"y":60,"width":10,"height":6},"definition":{"title":"Redshift","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4378878990717088,"layout":{"x":47,"y":53,"width":10,"height":6},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":1372798678484004,"layout":{"x":36,"y":53,"width":10,"height":6},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":2}},{"id":5430267548904274,"layout":{"x":36,"y":60,"width":10,"height":6},"definition":{"title":"Dynamo DB","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6866015780446286,"layout":{"x":58,"y":53,"width":10,"height":6},"definition":{"title":"Aurora","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4189990561597372,"layout":{"x":81,"y":60,"width":10,"height":6},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6794880110244638,"layout":{"x":92,"y":60,"width":10,"height":6},"definition":{"title":"Redshift","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":3804091029771224,"layout":{"x":81,"y":53,"width":10,"height":6},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":2376719938053794,"layout":{"x":70,"y":53,"width":10,"height":6},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":2}},{"id":4938111418300732,"layout":{"x":70,"y":60,"width":10,"height":6},"definition":{"title":"Dynamo DB","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":7941183197778242,"layout":{"x":92,"y":53,"width":10,"height":6},"definition":{"title":"Aurora","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":2595322878823152,"layout":{"x":104,"y":16,"width":54,"height":25},"definition":{"title":"Total amount of snapshots for all hosts by time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","metadata":[{"expression":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}","alias_name":"DynamoDB snapshots "},{"expression":"sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}","alias_name":"EFS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}","alias_name":"RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}","alias_name":"DR RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}","alias_name":"Volumes snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}","alias_name":"Aurora snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}","alias_name":"Redshift snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}","alias_name":"DR Volume snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","alias_name":"DR Aurora snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","alias_name":"Summary"}],"style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"},"custom_links":[]}},{"id":5713746525788918,"layout":{"x":0,"y":75,"width":79,"height":29},"definition":{"title":"Alerts gathering for all hosts","title_size":"16","title_align":"left","time":{"live_span":"1w"},"type":"event_stream","query":"sources:n2ws","tags_execution":"and","event_size":"s"}},{"id":6784160051087150,"layout":{"x":104,"y":43,"width":54,"height":30},"definition":{"title":"Backups success over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}","alias_name":"Successful EBS backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}","alias_name":"EBS backup failures"},{"expression":"sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful backups"}],"style":{"palette":"warm","line_type":"solid","line_width":"normal"},"display_type":"area"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":208539378395674,"layout":{"x":70,"y":16,"width":13,"height":8},"definition":{"title":"Accounts","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.accounts_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[{"link":"https://{{host.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"precision":0}},{"id":4250125984175390,"layout":{"x":70,"y":25,"width":13,"height":8},"definition":{"title":"Policies","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.policies_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":3509183830204216,"layout":{"x":0,"y":16,"width":34,"height":26},"definition":{"title":"Available hosts","title_size":"16","title_align":"left","type":"hostmap","requests":{"fill":{"q":"avg:system.cpu.user{*} by {host}"}},"node_type":"host","no_metric_hosts":false,"no_group_hosts":true,"custom_links":[{"link":"https://{{$ip.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"style":{"palette":"green_to_orange","palette_flip":false}}},{"id":3358821477019238,"layout":{"x":36,"y":16,"width":13,"height":8},"definition":{"title":"Backup to EBS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user}))*100","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","custom_links":[],"precision":0}},{"id":3053098348251140,"layout":{"x":36,"y":25,"width":13,"height":8},"definition":{"title":"DR backups","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user}))*100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":"<","palette":"white_on_yellow","value":80},{"comparator":">","palette":"white_on_yellow","value":50}]}],"text_align":"left","custom_links":[],"precision":0}},{"id":7487526937796298,"layout":{"x":36,"y":34,"width":13,"height":8},"definition":{"title":"Backup to S3","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user}))*100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":892259706152026,"layout":{"x":0,"y":8,"width":34,"height":7},"definition":{"type":"note","content":"This dashboard summarizes data collected from N2WS Backup & Recovery hosts connected to DataDog","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":776355987885820,"layout":{"x":36,"y":8,"width":32,"height":7},"definition":{"type":"note","content":"Success Rate","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":1332884223536476,"layout":{"x":50,"y":16,"width":18,"height":8},"definition":{"type":"note","content":"Indicates percentage of backups that have succeeded. You can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":1122155945778222,"layout":{"x":50,"y":34,"width":18,"height":8},"definition":{"type":"note","content":"Indicates percentage of S3 backups that have succeeded. You can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":8947443314726402,"layout":{"x":70,"y":8,"width":32,"height":7},"definition":{"type":"note","content":"Total Summary","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":8276039098984018,"layout":{"x":84,"y":16,"width":18,"height":8},"definition":{"type":"note","content":"Total number of accounts on all hosts","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":456777395312592,"layout":{"x":84,"y":25,"width":18,"height":8},"definition":{"type":"note","content":"Total number of policies on all hosts","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":427414507061190,"layout":{"x":0,"y":43,"width":34,"height":9},"definition":{"type":"note","content":"Number of backed up entities by type","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"bottom"}},{"id":1021831416109504,"layout":{"x":36,"y":43,"width":32,"height":9},"definition":{"type":"note","content":"Number of backed up snapshots by type","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"bottom"}},{"id":177738093370028,"layout":{"x":70,"y":43,"width":32,"height":9},"definition":{"type":"note","content":"Number of backed up DR snapshots by type","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"bottom"}},{"id":8191563201835872,"layout":{"x":104,"y":8,"width":54,"height":7},"definition":{"type":"note","content":"Backups over time","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":6947773291986968,"layout":{"x":81,"y":75,"width":21,"height":9},"definition":{"title":"Average Volume Capacity ","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_usage_percentage_num{$host,$user}","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_red","value":80},{"comparator":"<=","palette":"white_on_yellow","value":20},{"comparator":">","palette":"white_on_green","value":20},{"comparator":"<","palette":"white_on_green","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":3448787702420418,"layout":{"x":81,"y":85,"width":21,"height":9},"definition":{"title":"Volumes above high watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_above_high_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_red","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":3674873670941034,"layout":{"x":103,"y":75,"width":38,"height":9},"definition":{"type":"note","content":"The average capacity of volumes that were backed up by N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":2877859327576680,"layout":{"x":103,"y":85,"width":38,"height":9},"definition":{"type":"note","content":"Number of backed up volumes that their capacity is higher than the high watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":718476280112238,"layout":{"x":103,"y":95,"width":38,"height":9},"definition":{"type":"note","content":"Number of backed up volumes that their capacity is lower than the low watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":6879791920341324,"layout":{"x":81,"y":95,"width":21,"height":9},"definition":{"title":"Volumes above high watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_below_low_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_yellow","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":1382593931662556,"layout":{"x":142,"y":75,"width":16,"height":29},"definition":{"type":"note","content":"Backed Up Volumes Capacity Data","background_color":"blue","font_size":"24","text_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":803122310080746,"layout":{"x":50,"y":25,"width":18,"height":8},"definition":{"type":"note","content":"Indicates percentage of DR (Disaster Recovery) backups that have succeeded. You can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}}],"template_variables":[{"name":"host","default":"*","prefix":"host"},{"name":"user","default":"*","prefix":"cpm"}],"layout_type":"free","is_read_only":false,"notify_list":[],"id":"mxh-xpz-32q"}
\ No newline at end of file
diff --git a/n2ws/assets/dashboards/N2WSBackup&Recovery-Graphicalversion-areas.json b/n2ws/assets/dashboards/N2WSBackup&Recovery-Graphicalversion-areas.json
deleted file mode 100644
index 0d263d9913..0000000000
--- a/n2ws/assets/dashboards/N2WSBackup&Recovery-Graphicalversion-areas.json
+++ /dev/null
@@ -1 +0,0 @@
-{"title":"N2WS Backup & Recovery - Backup Success Rates (Areas Graphs)","description":"## N2WS Backup & Recovery Dashboard\n\nThis dashboard summarizes data that was collected from all N2WS Backup & Recovery hosts that are connected to DataDog (cloned)","widgets":[{"id":2637556285457016,"layout":{"x":69,"y":16,"width":13,"height":8},"definition":{"title":"Accounts","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.accounts_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[{"link":"https://{{host.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"precision":0}},{"id":1132115760137398,"layout":{"x":69,"y":25,"width":13,"height":8},"definition":{"title":"Policies","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.policies_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6833713613288876,"layout":{"x":13,"y":0,"width":24,"height":6},"definition":{"type":"free_text","text":"N2WS Backup & Recovery  Servers Status","color":"#2B13E6","font_size":"56","text_align":"left"}},{"id":3660811894528512,"layout":{"x":0,"y":16,"width":37,"height":26},"definition":{"title":"Available hosts","title_size":"16","title_align":"left","type":"hostmap","requests":{"fill":{"q":"avg:system.cpu.user{*} by {host}"}},"node_type":"host","no_metric_hosts":false,"no_group_hosts":true,"custom_links":[{"link":"https://{{$ip.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"style":{"palette":"green_to_orange","palette_flip":false}}},{"id":4889683502691186,"layout":{"x":39,"y":16,"width":13,"height":8},"definition":{"title":"Backup to EBS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user}))*100","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","custom_links":[],"precision":0}},{"id":4495620089867176,"layout":{"x":39,"y":25,"width":13,"height":8},"definition":{"title":"DR backups","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user}))*100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":"<","palette":"white_on_yellow","value":80},{"comparator":">","palette":"white_on_yellow","value":50}]}],"text_align":"left","custom_links":[],"precision":0}},{"id":7599208437230966,"layout":{"x":39,"y":34,"width":13,"height":8},"definition":{"title":"Backup to S3","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user}))*100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":4085517614690048,"layout":{"x":0,"y":0,"width":12,"height":7},"definition":{"type":"image","url":"https://n2ws.com/wp-content/uploads/2018/10/N2WS_Logo-Primary-2.svg","sizing":"fit"}},{"id":2595322878823152,"layout":{"x":119,"y":44,"width":37,"height":25},"definition":{"title":"Total amount of snapshots by type over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}","alias_name":"DynamoDB snapshots "},{"expression":"sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}","alias_name":"EFS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}","alias_name":"RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}","alias_name":"DR RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}","alias_name":"Volumes snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}","alias_name":"Aurora snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}","alias_name":"Redshift snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}","alias_name":"DR Volume snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","alias_name":"DR Aurora snapshots"}],"style":{"palette":"cool","line_type":"solid","line_width":"normal"},"display_type":"area"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":1844247243659372,"layout":{"x":0,"y":44,"width":37,"height":25},"definition":{"title":"Backups success over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}","alias_name":"Successful EBS backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}","alias_name":"EBS backup failures"},{"expression":"sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful backups"}],"style":{"palette":"warm","line_type":"solid","line_width":"normal"},"display_type":"area"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":5584509867253186,"layout":{"x":39,"y":44,"width":38,"height":25},"definition":{"title":"Backups DR success over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user} by {cpm}","alias_name":"Successful DR backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user} by {cpm}","alias_name":"DR backups failure"},{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful DR backups"}],"style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"area"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":614497561179518,"layout":{"x":79,"y":44,"width":38,"height":25},"definition":{"title":"S3 Backups success over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user} by {cpm}","alias_name":"Successful S3 backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user} by {cpm}","alias_name":"S3 backups failure"},{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful S3 backups"}],"style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"area"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":7180936149683416,"layout":{"x":0,"y":71,"width":59,"height":26},"definition":{"title":"Alerts gathering for all hosts","title_size":"16","title_align":"left","time":{"live_span":"1w"},"type":"event_stream","query":"sources:n2ws","tags_execution":"and","event_size":"s"}},{"id":5945986900303426,"layout":{"x":99,"y":16,"width":12,"height":8},"definition":{"title":"Instances","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_instances_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4419154600287480,"layout":{"x":112,"y":34,"width":12,"height":8},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":1935790075102,"layout":{"x":125,"y":25,"width":12,"height":8},"definition":{"title":"Redshift","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_redshift_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":7971473927039272,"layout":{"x":125,"y":16,"width":12,"height":8},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_db_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":3588851606457020,"layout":{"x":112,"y":16,"width":12,"height":8},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_volumes_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":2}},{"id":981117228066646,"layout":{"x":112,"y":25,"width":12,"height":8},"definition":{"title":"Dynamo DB","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_ddb_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":7374759144596838,"layout":{"x":99,"y":25,"width":12,"height":8},"definition":{"title":"Aurora","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_clus_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6182576205949094,"layout":{"x":0,"y":8,"width":37,"height":7},"definition":{"type":"note","content":"This dashboard summarizes data collected from N2WS Backup & Recovery hosts connected to DataDog","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":163195945008220,"layout":{"x":39,"y":8,"width":28,"height":7},"definition":{"type":"note","content":"Success Rate","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":2923528343457910,"layout":{"x":53,"y":16,"width":14,"height":8},"definition":{"type":"note","content":"Indicates percentage of backups that have succeeded. \nYou can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":8418227565588260,"layout":{"x":53,"y":25,"width":14,"height":8},"definition":{"type":"note","content":"Indicates percentage of DR (Disaster Recovery) backups that have succeeded. \nYou can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":8748196710797844,"layout":{"x":53,"y":34,"width":14,"height":8},"definition":{"type":"note","content":"Indicates percentage of S3 backups that have succeeded (Glacier backups aren't counted). \nYou can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":2007395944978376,"layout":{"x":69,"y":8,"width":28,"height":7},"definition":{"type":"note","content":"Total Summary","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":3127155320728790,"layout":{"x":83,"y":16,"width":14,"height":8},"definition":{"type":"note","content":"Total number of accounts on all hosts","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7272280144470548,"layout":{"x":83,"y":25,"width":14,"height":8},"definition":{"type":"note","content":"Total number of policies on all hosts","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7845771991582078,"layout":{"x":99,"y":8,"width":57,"height":7},"definition":{"type":"note","content":"How many Entities have you backed up?","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":822785988778976,"layout":{"x":138,"y":16,"width":18,"height":24},"definition":{"type":"note","content":"Tracks number of entities backed up by all N2WS Backup & Recovery hosts.\n\nPlease note that if an instance, for example, was backed up by 2 N2WS hosts, it will be  counted twice.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7702466249586728,"layout":{"x":60,"y":71,"width":16,"height":26},"definition":{"type":"note","content":"DataDog and N2WS Backup & Recovery hosts alerts","background_color":"blue","font_size":"24","text_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":6184828882153520,"layout":{"x":79,"y":71,"width":21,"height":8},"definition":{"title":"Average Volume Capacity ","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_usage_percentage_num{$host,$user}","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_red","value":80},{"comparator":"<=","palette":"white_on_yellow","value":20},{"comparator":">","palette":"white_on_green","value":20},{"comparator":"<","palette":"white_on_green","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":5044747906249744,"layout":{"x":79,"y":80,"width":21,"height":8},"definition":{"title":"Volumes above high watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_above_high_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_red","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":7142455690032772,"layout":{"x":101,"y":71,"width":38,"height":8},"definition":{"type":"note","content":"The average capacity of volumes that were backed up by N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":6406821361983512,"layout":{"x":101,"y":80,"width":38,"height":8},"definition":{"type":"note","content":"Number of backed up volumes that their capacity is higher than the high watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":1223244874390138,"layout":{"x":101,"y":89,"width":38,"height":8},"definition":{"type":"note","content":"Number of backed up volumes that their capacity is lower than the low watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":437205163209710,"layout":{"x":79,"y":89,"width":21,"height":8},"definition":{"title":"Volumes above high watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_below_low_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_yellow","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":8357335241437432,"layout":{"x":140,"y":71,"width":16,"height":26},"definition":{"type":"note","content":"Backed Up Volumes Capacity Data","background_color":"blue","font_size":"24","text_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"left"}}],"template_variables":[{"name":"host","default":"*","prefix":"host"},{"name":"user","default":"*","prefix":"cpm"}],"layout_type":"free","is_read_only":false,"notify_list":[],"id":"2as-nk4-rzu"}
\ No newline at end of file
diff --git a/n2ws/assets/dashboards/N2WSBackup&Recovery-Graphicalversion.json b/n2ws/assets/dashboards/N2WSBackup&Recovery-Graphicalversion.json
deleted file mode 100644
index b4979b0129..0000000000
--- a/n2ws/assets/dashboards/N2WSBackup&Recovery-Graphicalversion.json
+++ /dev/null
@@ -1 +0,0 @@
-{"title":"N2WS Backup & Recovery - Backup Success Rates (Column Graphs)","description":"## N2WS Backup & Recovery Dashboard\n\nThis dashboard summarizes data that was collected from all N2WS Backup & Recovery hosts that are connected to DataDog\n","widgets":[{"id":2637556285457016,"layout":{"x":69,"y":16,"width":13,"height":8},"definition":{"title":"Accounts","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.accounts_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[{"link":"https://{{host.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"precision":0}},{"id":1132115760137398,"layout":{"x":69,"y":25,"width":13,"height":8},"definition":{"title":"Policies","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.policies_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6833713613288876,"layout":{"x":13,"y":0,"width":24,"height":6},"definition":{"type":"free_text","text":"N2WS Backup & Recovery  Servers Status","color":"#2B13E6","font_size":"56","text_align":"left"}},{"id":3660811894528512,"layout":{"x":0,"y":16,"width":37,"height":26},"definition":{"title":"Available hosts","title_size":"16","title_align":"left","type":"hostmap","requests":{"fill":{"q":"avg:system.cpu.user{*} by {host}"}},"node_type":"host","no_metric_hosts":false,"no_group_hosts":true,"custom_links":[{"link":"https://{{$ip.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"style":{"palette":"green_to_orange","palette_flip":false}}},{"id":4889683502691186,"layout":{"x":39,"y":16,"width":13,"height":8},"definition":{"title":"Backup to EBS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user}))*100","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","custom_links":[],"precision":0}},{"id":4495620089867176,"layout":{"x":39,"y":25,"width":13,"height":8},"definition":{"title":"DR backups","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user}))*100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":"<","palette":"white_on_yellow","value":80},{"comparator":">","palette":"white_on_yellow","value":50}]}],"text_align":"left","custom_links":[],"precision":0}},{"id":7599208437230966,"layout":{"x":39,"y":34,"width":13,"height":8},"definition":{"title":"Backup to S3","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user}))*100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"white_on_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":4085517614690048,"layout":{"x":0,"y":0,"width":12,"height":7},"definition":{"type":"image","url":"https://n2ws.com/wp-content/uploads/2018/10/N2WS_Logo-Primary-2.svg","sizing":"fit"}},{"id":2595322878823152,"layout":{"x":119,"y":44,"width":37,"height":25},"definition":{"title":"Total amount of snapshots by type over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}","alias_name":"DynamoDB snapshots "},{"expression":"sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}","alias_name":"EFS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}","alias_name":"RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}","alias_name":"DR RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}","alias_name":"Volumes snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}","alias_name":"Aurora snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}","alias_name":"Redshift snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}","alias_name":"DR Volume snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","alias_name":"DR Aurora snapshots"}],"style":{"palette":"cool","line_type":"solid","line_width":"normal"},"display_type":"bars"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":1844247243659372,"layout":{"x":0,"y":44,"width":37,"height":25},"definition":{"title":"Backups success over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}","alias_name":"Successful EBS backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}","alias_name":"EBS backup failures"},{"expression":"sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful backups"}],"style":{"palette":"warm","line_type":"solid","line_width":"normal"},"display_type":"bars"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":5584509867253186,"layout":{"x":39,"y":44,"width":38,"height":25},"definition":{"title":"Backups DR success over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user} by {cpm}","alias_name":"Successful DR backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user} by {cpm}","alias_name":"DR backups failure"},{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful DR backups"}],"style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"bars"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":614497561179518,"layout":{"x":79,"y":44,"width":38,"height":25},"definition":{"title":"S3 Backups success over time","title_size":"16","title_align":"left","show_legend":true,"legend_size":"0","time":{"live_span":"1mo"},"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user} by {cpm}","alias_name":"Successful S3 backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user} by {cpm}","alias_name":"S3 backups failure"},{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful S3 backups"}],"style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"bars"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"}}},{"id":7180936149683416,"layout":{"x":0,"y":71,"width":60,"height":26},"definition":{"title":"Alerts gathering for all hosts","title_size":"16","title_align":"left","time":{"live_span":"1w"},"type":"event_stream","query":"sources:n2ws","tags_execution":"and","event_size":"s"}},{"id":5945986900303426,"layout":{"x":99,"y":16,"width":12,"height":8},"definition":{"title":"Instances","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_instances_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4419154600287480,"layout":{"x":112,"y":34,"width":12,"height":8},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":1935790075102,"layout":{"x":125,"y":25,"width":12,"height":8},"definition":{"title":"Redshift","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_redshift_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":7971473927039272,"layout":{"x":125,"y":16,"width":12,"height":8},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_db_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":3588851606457020,"layout":{"x":112,"y":16,"width":12,"height":8},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_volumes_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":2}},{"id":981117228066646,"layout":{"x":112,"y":25,"width":12,"height":8},"definition":{"title":"Dynamo DB","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_ddb_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":7374759144596838,"layout":{"x":99,"y":25,"width":12,"height":8},"definition":{"title":"Aurora","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_clus_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6182576205949094,"layout":{"x":0,"y":8,"width":37,"height":7},"definition":{"type":"note","content":"This dashboard summarizes data collected from N2WS Backup & Recovery hosts connected to DataDog","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":163195945008220,"layout":{"x":39,"y":8,"width":28,"height":7},"definition":{"type":"note","content":"Success Rate","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":2923528343457910,"layout":{"x":53,"y":16,"width":14,"height":8},"definition":{"type":"note","content":"Indicates percentage of backups that have succeeded. You can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":8418227565588260,"layout":{"x":53,"y":25,"width":14,"height":8},"definition":{"type":"note","content":"Indicates percentage of DR (Disaster Recovery) backups that have succeeded. You can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":8748196710797844,"layout":{"x":53,"y":34,"width":14,"height":8},"definition":{"type":"note","content":"Indicates percentage of S3 backups that have succeeded (Glacier backups aren't counted). \nYou can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":2007395944978376,"layout":{"x":69,"y":8,"width":28,"height":7},"definition":{"type":"note","content":"Total Summary","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":3127155320728790,"layout":{"x":83,"y":16,"width":14,"height":8},"definition":{"type":"note","content":"Total number of accounts on all hosts","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7272280144470548,"layout":{"x":83,"y":25,"width":14,"height":8},"definition":{"type":"note","content":"Total number of policies on all hosts","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7845771991582078,"layout":{"x":99,"y":8,"width":57,"height":7},"definition":{"type":"note","content":"How many Entities have you backed up?","background_color":"blue","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":822785988778976,"layout":{"x":138,"y":16,"width":18,"height":26},"definition":{"type":"note","content":"Tracks number of entities backed up by all N2WS Backup & Recovery hosts.\n\nPlease note that if an instance, for example, was backed up by 2 N2WS hosts, it will be  counted twice.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7702466249586728,"layout":{"x":61,"y":71,"width":16,"height":26},"definition":{"type":"note","content":"DataDog and N2WS Backup & Recovery hosts alerts","background_color":"blue","font_size":"24","text_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":6184828882153520,"layout":{"x":79,"y":71,"width":21,"height":8},"definition":{"title":"Average Volume Capacity ","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_usage_percentage_num{$host,$user}","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_red","value":80},{"comparator":"<=","palette":"white_on_yellow","value":20},{"comparator":">","palette":"white_on_green","value":20},{"comparator":"<","palette":"white_on_green","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":5044747906249744,"layout":{"x":79,"y":80,"width":21,"height":8},"definition":{"title":"Volumes above high watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_above_high_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_red","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":7142455690032772,"layout":{"x":101,"y":71,"width":38,"height":8},"definition":{"type":"note","content":"The average capacity of volumes that were backed up by N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":6406821361983512,"layout":{"x":101,"y":80,"width":38,"height":8},"definition":{"type":"note","content":"Number of backed up volumes that their capacity is higher than the high watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":1223244874390138,"layout":{"x":101,"y":89,"width":38,"height":8},"definition":{"type":"note","content":"Number of backed up volumes that their capacity is lower than the low watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":437205163209710,"layout":{"x":79,"y":89,"width":21,"height":8},"definition":{"title":"Volumes above high watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_below_low_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_yellow","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":8357335241437432,"layout":{"x":140,"y":71,"width":16,"height":26},"definition":{"type":"note","content":"Backed Up Volumes Capacity Data","background_color":"blue","font_size":"24","text_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"left"}}],"template_variables":[{"name":"host","default":"*","prefix":"host"},{"name":"user","default":"*","prefix":"cpm"}],"layout_type":"free","is_read_only":false,"notify_list":[],"id":"7pu-dtq-qu9"}
\ No newline at end of file
diff --git a/n2ws/assets/dashboards/N2WSBackup&RecoveryV4.0-BackupSuccessRates(ColumnGraphs).json b/n2ws/assets/dashboards/N2WSBackup&RecoveryV4.0-BackupSuccessRates(ColumnGraphs).json
deleted file mode 100644
index 4f91898b16..0000000000
--- a/n2ws/assets/dashboards/N2WSBackup&RecoveryV4.0-BackupSuccessRates(ColumnGraphs).json
+++ /dev/null
@@ -1 +0,0 @@
-{"title":"N2WS Backup & Recovery v4.0 - Backup Success Rates (Column Graphs)","description":"## N2WS Backup & Recovery v4.0 Dashboard\n\nThis dashboard summarizes data that was collected from all N2WS Backup & Recovery v4.0 hosts that are connected to DataDog","widgets":[{"id":2637556285457016,"layout":{"x":63,"y":16,"width":11,"height":8},"definition":{"title":"Accounts","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.azure_accounts_num{$host,$user}+sum:cpm_metric.dashboard_state.accounts_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[{"link":"https://{{host.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"precision":0}},{"id":1132115760137398,"layout":{"x":63,"y":25,"width":11,"height":8},"definition":{"title":"Policies","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.azure_policies_num{$host,$user}+sum:cpm_metric.dashboard_state.policies_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":6833713613288876,"layout":{"x":12,"y":0,"width":24,"height":6},"definition":{"type":"free_text","text":"N2WS Backup & Recovery  v4.0 Servers Status","color":"#2B13E6","font_size":"56","text_align":"left"}},{"id":3660811894528512,"layout":{"x":0,"y":16,"width":34,"height":26},"definition":{"title":"Available hosts","title_size":"16","title_align":"left","type":"hostmap","requests":{"fill":{"q":"avg:system.cpu.user{*} by {host}"}},"node_type":"host","no_metric_hosts":false,"no_group_hosts":true,"custom_links":[{"link":"https://{{$ip.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"style":{"palette":"green_to_orange","palette_flip":false}}},{"id":4889683502691186,"layout":{"x":36,"y":16,"width":11,"height":8},"definition":{"title":"Simple Backups","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user}))*100","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"black_on_light_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":4495620089867176,"layout":{"x":36,"y":25,"width":11,"height":8},"definition":{"title":"DR backups","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user}))*100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"black_on_light_red","value":50},{"comparator":"<","palette":"white_on_yellow","value":80},{"comparator":">","palette":"white_on_yellow","value":50}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":7599208437230966,"layout":{"x":36,"y":34,"width":11,"height":8},"definition":{"title":"Backup to S3","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user}))*100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"black_on_light_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":4085517614690048,"layout":{"x":0,"y":0,"width":12,"height":8},"definition":{"type":"image","url":"https://n2ws.com/wp-content/uploads/2018/10/N2WS_Logo-Primary-2.svg","sizing":"fit"}},{"id":2595322878823152,"layout":{"x":119,"y":44,"width":37,"height":25},"definition":{"title":"Total amount of snapshots by type over time","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"vertical","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_fsx_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_disk_num{$host,$user} by {host}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}","alias_name":"DynamoDB snapshots "},{"expression":"sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}","alias_name":"EFS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}","alias_name":"RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}","alias_name":"DR RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}","alias_name":"Volumes snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}","alias_name":"Aurora snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}","alias_name":"Redshift snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}","alias_name":"DR Volume snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","alias_name":"DR Aurora snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_fsx_num{$host,$user} by {host}","alias_name":"FSx snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_disk_num{$host,$user} by {host}","alias_name":"Azure Disks"}],"style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"bars"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"},"markers":[]}},{"id":1844247243659372,"layout":{"x":0,"y":44,"width":37,"height":25},"definition":{"title":"AWS Backups success over time","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}","alias_name":"Successful EBS backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}","alias_name":"EBS backup failures"},{"expression":"sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful backups"}],"style":{"palette":"warm","line_type":"solid","line_width":"normal"},"display_type":"bars"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"},"markers":[]}},{"id":5584509867253186,"layout":{"x":39,"y":44,"width":38,"height":25},"definition":{"title":"AWS Backups DR success over time","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user} by {cpm}","alias_name":"Successful DR backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user} by {cpm}","alias_name":"DR backups failure"},{"expression":"sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful DR backups"}],"style":{"palette":"cool","line_type":"solid","line_width":"normal"},"display_type":"bars"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"},"markers":[]}},{"id":614497561179518,"layout":{"x":79,"y":44,"width":38,"height":25},"definition":{"title":"AWS S3 Backups success over time","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user} by {cpm}","alias_name":"Successful S3 backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user} by {cpm}","alias_name":"S3 backups failure"},{"expression":"sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful S3 backups"}],"style":{"palette":"orange","line_type":"solid","line_width":"normal"},"display_type":"bars"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"},"markers":[]}},{"id":7180936149683416,"layout":{"x":0,"y":71,"width":60,"height":26},"definition":{"title":"Alerts gathering for all hosts","title_size":"16","title_align":"left","time":{"live_span":"1w"},"type":"event_stream","query":"sources:n2ws hosts:$host cpm:$user","tags_execution":"and","event_size":"l"}},{"id":5945986900303426,"layout":{"x":103,"y":16,"width":9,"height":6},"definition":{"title":"Instances","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_instances_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4419154600287480,"layout":{"x":123,"y":23,"width":9,"height":6},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":1935790075102,"layout":{"x":113,"y":23,"width":9,"height":6},"definition":{"title":"Redshift","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_redshift_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":7971473927039272,"layout":{"x":123,"y":16,"width":9,"height":6},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_db_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":3588851606457020,"layout":{"x":113,"y":16,"width":9,"height":6},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_volumes_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":2}},{"id":981117228066646,"layout":{"x":103,"y":23,"width":9,"height":6},"definition":{"title":"Dynamo DB","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_ddb_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":7374759144596838,"layout":{"x":133,"y":16,"width":9,"height":6},"definition":{"title":"Aurora","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_clus_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6182576205949094,"layout":{"x":0,"y":8,"width":34,"height":7},"definition":{"type":"note","content":"This dashboard summarizes data collected from N2WS Backup & Recovery v4.0 hosts connected to DataDog","background_color":"white","font_size":"14","text_align":"left","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":163195945008220,"layout":{"x":36,"y":8,"width":25,"height":7},"definition":{"type":"note","content":"Success Rate","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":2923528343457910,"layout":{"x":48,"y":16,"width":13,"height":8},"definition":{"type":"note","content":"### Azure & AWS\nIndicates percentage of backups that have succeeded. \nYou can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":8418227565588260,"layout":{"x":48,"y":25,"width":13,"height":8},"definition":{"type":"note","content":"### AWS Only\nIndicates percentage of DR (Disaster Recovery) backups that have succeeded. \nYou can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":8748196710797844,"layout":{"x":48,"y":34,"width":13,"height":8},"definition":{"type":"note","content":"### AWS Only\nIndicates percentage of S3 backups that have succeeded (Glacier backups aren't counted). \nYou can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":2007395944978376,"layout":{"x":63,"y":8,"width":25,"height":7},"definition":{"type":"note","content":"Total Summary","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":3127155320728790,"layout":{"x":75,"y":16,"width":13,"height":8},"definition":{"type":"note","content":"Total number of accounts on all hosts for all clouds","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7272280144470548,"layout":{"x":75,"y":25,"width":13,"height":8},"definition":{"type":"note","content":"Total number of policies on all hosts for all clouds","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7845771991582078,"layout":{"x":90,"y":8,"width":66,"height":7},"definition":{"type":"note","content":"How many Entities have you protected?","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":822785988778976,"layout":{"x":143,"y":16,"width":13,"height":27},"definition":{"type":"note","content":"Tracks number of entities covered by policies by all N2WS Backup & Recovery hosts.\n\nPlease note that if an instance, for example, was covered by policies in 2 N2WS hosts, it will be  counted twice.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":7702466249586728,"layout":{"x":61,"y":71,"width":16,"height":26},"definition":{"type":"note","content":"DataDog and N2WS Backup & Recovery hosts alerts","background_color":"yellow","font_size":"24","text_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":6184828882153520,"layout":{"x":79,"y":71,"width":21,"height":8},"definition":{"title":"Average AWS Volume Capacity ","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_usage_percentage_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_red","value":80},{"comparator":"<=","palette":"white_on_yellow","value":20},{"comparator":">","palette":"white_on_green","value":20},{"comparator":"<","palette":"white_on_green","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":5044747906249744,"layout":{"x":79,"y":80,"width":21,"height":8},"definition":{"title":"Volumes Above High Watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_above_high_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_red","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":7142455690032772,"layout":{"x":101,"y":71,"width":38,"height":8},"definition":{"type":"note","content":"The average capacity of AWS volumes that were backed up by N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":6406821361983512,"layout":{"x":101,"y":80,"width":38,"height":8},"definition":{"type":"note","content":"Number of backed up AWS volumes that have capacity higher than the high watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":1223244874390138,"layout":{"x":101,"y":89,"width":38,"height":8},"definition":{"type":"note","content":"Number of backed up AWS volumes that have capacity lower than the low watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":437205163209710,"layout":{"x":79,"y":89,"width":21,"height":8},"definition":{"title":"Volumes Below Low Watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_below_low_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_yellow","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":8357335241437432,"layout":{"x":140,"y":71,"width":16,"height":26},"definition":{"type":"note","content":"Backed Up Volumes Capacity Data","background_color":"yellow","font_size":"24","text_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":5429797099678030,"layout":{"x":133,"y":23,"width":9,"height":6},"definition":{"title":"FSx","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_fsx_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":6393622216634412,"layout":{"x":103,"y":30,"width":9,"height":6},"definition":{"title":"VMs","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_virtual_machines_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":1335830288842960,"layout":{"x":103,"y":37,"width":9,"height":6},"definition":{"title":"Disks","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_disks_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":6343939055837336,"layout":{"x":90,"y":16,"width":12,"height":13},"definition":{"type":"note","content":"AWS","background_color":"vivid_orange","font_size":"24","text_align":"center","vertical_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"right","has_padding":false}},{"id":7126009984198560,"layout":{"x":90,"y":30,"width":12,"height":13},"definition":{"type":"note","content":"Azure","background_color":"blue","font_size":"24","text_align":"center","vertical_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"right","has_padding":true}}],"template_variables":[{"name":"host","default":"*","prefix":"host"},{"name":"user","default":"*","prefix":"cpm"}],"layout_type":"free","is_read_only":false,"notify_list":[],"id":"ahd-2gj-tmw"}
\ No newline at end of file
diff --git a/n2ws/assets/dashboards/N2WSBackup&RecoveryV4.0-EntityTypesDetails.json b/n2ws/assets/dashboards/N2WSBackup&RecoveryV4.0-EntityTypesDetails.json
deleted file mode 100644
index 5092f89081..0000000000
--- a/n2ws/assets/dashboards/N2WSBackup&RecoveryV4.0-EntityTypesDetails.json
+++ /dev/null
@@ -1 +0,0 @@
-{"title":"N2WS Backup & Recovery v4.0 - Entity Types Details","description":"## N2WS Backup & Recovery version 4.0 - Detailed Dashboard by Entity Type \n\nThis dashboard summarizes data that was collected from all N2WS Backup & Recovery hosts that are connected to DataDog, giving more details about entities types","widgets":[{"id":6833713613288876,"layout":{"x":13,"y":0,"width":24,"height":6},"definition":{"type":"free_text","text":"N2WS Backup & Recovery v4.0  Servers Status","color":"#2B13E6","font_size":"56","text_align":"left"}},{"id":4085517614690048,"layout":{"x":0,"y":0,"width":12,"height":8},"definition":{"type":"image","url":"https://n2ws.com/wp-content/uploads/2018/10/N2WS_Logo-Primary-2.svg","sizing":"fit"}},{"id":3059142389457708,"layout":{"x":14,"y":53,"width":10,"height":6},"definition":{"title":"Instances","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_instances_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4931723730478434,"layout":{"x":25,"y":67,"width":9,"height":6},"definition":{"title":"FSx","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_fsx_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":2428912746970058,"layout":{"x":35,"y":60,"width":9,"height":6},"definition":{"title":"Redshift","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_redshift_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6882875583965308,"layout":{"x":35,"y":53,"width":9,"height":6},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_db_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":1705799585091706,"layout":{"x":25,"y":53,"width":9,"height":6},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_volumes_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":2}},{"id":1828199094188556,"layout":{"x":25,"y":60,"width":9,"height":6},"definition":{"title":"Dynamo DB","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_ddb_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":5138781865653636,"layout":{"x":14,"y":60,"width":10,"height":6},"definition":{"title":"Aurora","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_rds_clus_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":5429842537420874,"layout":{"x":66,"y":60,"width":9,"height":6},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":2150896737699084,"layout":{"x":56,"y":60,"width":9,"height":6},"definition":{"title":"Redshift","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4378878990717088,"layout":{"x":56,"y":53,"width":9,"height":6},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":1372798678484004,"layout":{"x":46,"y":53,"width":9,"height":6},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":2}},{"id":5430267548904274,"layout":{"x":46,"y":60,"width":9,"height":6},"definition":{"title":"Dynamo DB","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":6866015780446286,"layout":{"x":66,"y":53,"width":9,"height":6},"definition":{"title":"Aurora","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":4189990561597372,"layout":{"x":96,"y":53,"width":8,"height":6},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_dr_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":3804091029771224,"layout":{"x":87,"y":53,"width":8,"height":6},"definition":{"title":"RDS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":2376719938053794,"layout":{"x":77,"y":53,"width":9,"height":6},"definition":{"title":"Volumes","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":2595322878823152,"layout":{"x":106,"y":16,"width":54,"height":25},"definition":{"title":"Total amount of snapshots for all hosts by time","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"vertical","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_fsx_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_disk_num{$host,$user} by {host}, sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_fsx_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_disk_num{$host,$user} by {host}","metadata":[{"expression":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}","alias_name":"DynamoDB snapshots "},{"expression":"sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}","alias_name":"EFS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}","alias_name":"RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}","alias_name":"DR RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}","alias_name":"Volumes snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}","alias_name":"Aurora snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}","alias_name":"Redshift snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}","alias_name":"DR RDS snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}","alias_name":"DR Aurora snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_fsx_num{$host,$user} by {host}","alias_name":"FSx snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_disk_num{$host,$user} by {host}","alias_name":"Disks snapshots"},{"expression":"sum:cpm_metric.dashboard_state.snapshots_ddb_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_efs_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_rds_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_rds_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_volume_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_rds_clus_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_redshift_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_volume_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_dr_rds_clus_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_fsx_num{$host,$user} by {host}+sum:cpm_metric.dashboard_state.snapshots_disk_num{$host,$user} by {host}","alias_name":"Summary"}],"style":{"palette":"dog_classic","line_type":"solid","line_width":"normal"},"display_type":"line"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"},"markers":[]}},{"id":5713746525788918,"layout":{"x":0,"y":81,"width":75,"height":23},"definition":{"title":"Alerts gathering for all hosts","title_size":"16","title_align":"left","time":{"live_span":"1w"},"type":"event_stream","query":"sources:n2ws hosts:$host cpm:$user","tags_execution":"and","event_size":"l"}},{"id":6784160051087150,"layout":{"x":106,"y":43,"width":54,"height":30},"definition":{"title":"Backups success over time","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"q":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}, sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","on_right_yaxis":false,"metadata":[{"expression":"sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user} by {cpm}","alias_name":"Successful EBS backups"},{"expression":"sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user} by {cpm}","alias_name":"EBS backup failures"},{"expression":"sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user} by {cpm}","alias_name":"Partially successful backups"}],"style":{"palette":"warm","line_type":"solid","line_width":"normal"},"display_type":"area"}],"yaxis":{"scale":"linear","label":"","include_zero":true,"min":"auto","max":"auto"},"markers":[]}},{"id":208539378395674,"layout":{"x":77,"y":16,"width":12,"height":8},"definition":{"title":"Accounts","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.azure_accounts_num{$host,$user}+sum:cpm_metric.dashboard_state.accounts_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[{"link":"https://{{host.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"precision":0}},{"id":4250125984175390,"layout":{"x":77,"y":25,"width":12,"height":8},"definition":{"title":"Policies","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.azure_policies_num{$host,$user}+sum:cpm_metric.dashboard_state.policies_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":3509183830204216,"layout":{"x":0,"y":16,"width":44,"height":26},"definition":{"title":"Available hosts","title_size":"16","title_align":"left","type":"hostmap","requests":{"fill":{"q":"avg:system.cpu.user{*} by {host}"}},"node_type":"host","no_metric_hosts":false,"no_group_hosts":true,"custom_links":[{"link":"https://{{$ip.value}}/ui/dashboard/","label":"Go to host's Dashboard"}],"style":{"palette":"green_to_orange","palette_flip":false}}},{"id":3358821477019238,"layout":{"x":46,"y":16,"width":12,"height":8},"definition":{"title":"Simple Backups","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}/(sum:cpm_metric.dashboard_activity.backup_success_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_partial_num{$host,$user}+sum:cpm_metric.dashboard_activity.backup_fail_num{$host,$user}))*100","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"black_on_light_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":3053098348251140,"layout":{"x":46,"y":25,"width":12,"height":8},"definition":{"title":"DR backups","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user} / (sum:cpm_metric.dashboard_activity.backup_dr_success_num{$host,$user} + sum:cpm_metric.dashboard_activity.backup_dr_partial_num{$host,$user} + sum:cpm_metric.dashboard_activity.backup_dr_fail_num{$host,$user})) * 100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"black_on_light_red","value":50},{"comparator":"<","palette":"white_on_yellow","value":80},{"comparator":">","palette":"white_on_yellow","value":50}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":7487526937796298,"layout":{"x":46,"y":34,"width":12,"height":8},"definition":{"title":"Backup to S3","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"(sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user} / (sum:cpm_metric.dashboard_activity.backup_s3_success_num{$host,$user} + sum:cpm_metric.dashboard_activity.backup_s3_partial_num{$host,$user} + sum:cpm_metric.dashboard_activity.backup_s3_fail_num{$host,$user})) * 100","aggregator":"last","conditional_formats":[{"comparator":">","palette":"white_on_green","value":80},{"comparator":"<=","palette":"black_on_light_red","value":50},{"comparator":">","palette":"white_on_yellow","value":50},{"comparator":"<","palette":"white_on_yellow","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":892259706152026,"layout":{"x":0,"y":8,"width":44,"height":7},"definition":{"type":"note","content":"This dashboard summarizes data collected from N2WS Backup & Recovery version 4.0 hosts connected to DataDog","background_color":"white","font_size":"14","text_align":"left","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":776355987885820,"layout":{"x":46,"y":8,"width":29,"height":7},"definition":{"type":"note","content":"Success Rate","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":1332884223536476,"layout":{"x":59,"y":16,"width":16,"height":8},"definition":{"type":"note","content":"### Azure & AWS\nIndicates percentage of backups that have succeeded. You can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":1122155945778222,"layout":{"x":59,"y":34,"width":16,"height":8},"definition":{"type":"note","content":"### AWS Only\nIndicates percentage of S3 backups that have succeeded. You can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":8947443314726402,"layout":{"x":77,"y":8,"width":27,"height":7},"definition":{"type":"note","content":"Total Summary","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":8276039098984018,"layout":{"x":90,"y":16,"width":14,"height":8},"definition":{"type":"note","content":"Total number of accounts on all hosts and all clouds","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":456777395312592,"layout":{"x":90,"y":25,"width":14,"height":8},"definition":{"type":"note","content":"Total number of policies on all hosts","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":427414507061190,"layout":{"x":14,"y":43,"width":30,"height":9},"definition":{"type":"note","content":"Number of backed up entities by type","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"bottom"}},{"id":1021831416109504,"layout":{"x":46,"y":43,"width":29,"height":9},"definition":{"type":"note","content":"Number of backed up snapshots by type","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"bottom"}},{"id":177738093370028,"layout":{"x":77,"y":43,"width":27,"height":9},"definition":{"type":"note","content":"Number of backed up DR snapshots by type","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"bottom"}},{"id":8191563201835872,"layout":{"x":106,"y":8,"width":54,"height":7},"definition":{"type":"note","content":"Backups over time","background_color":"yellow","font_size":"24","text_align":"center","show_tick":false,"tick_pos":"50%","tick_edge":"left"}},{"id":6947773291986968,"layout":{"x":77,"y":75,"width":28,"height":9},"definition":{"title":"Average AWS Volume Capacity ","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_usage_percentage_num{$host,$user}","aggregator":"avg","conditional_formats":[{"comparator":">","palette":"white_on_red","value":80},{"comparator":"<=","palette":"white_on_yellow","value":20},{"comparator":">","palette":"white_on_green","value":20},{"comparator":"<","palette":"white_on_green","value":80}]}],"custom_unit":"%","text_align":"left","precision":0}},{"id":3448787702420418,"layout":{"x":77,"y":85,"width":28,"height":9},"definition":{"title":"Volumes Above High Watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_above_high_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_red","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":3674873670941034,"layout":{"x":106,"y":75,"width":37,"height":9},"definition":{"type":"note","content":"The average capacity of AWS volumes that were backed up by N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":2877859327576680,"layout":{"x":106,"y":85,"width":37,"height":9},"definition":{"type":"note","content":"Number of backed up AWS volumes that have capacity higher than the high watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":718476280112238,"layout":{"x":106,"y":95,"width":37,"height":9},"definition":{"type":"note","content":"Number of backed up AWS volumes that have capacity lower than the low watermark defined in N2WS Backup & Recovery","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":6879791920341324,"layout":{"x":77,"y":95,"width":28,"height":9},"definition":{"title":"Volumes Below Low Watermark","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.volumes_below_low_watermark_num{$host,$user}","aggregator":"last","conditional_formats":[{"comparator":">=","palette":"white_on_yellow","value":1},{"comparator":"<","palette":"white_on_green","value":1}]}],"text_align":"left","precision":0}},{"id":1382593931662556,"layout":{"x":144,"y":75,"width":16,"height":29},"definition":{"type":"note","content":"Backed Up Volumes Capacity Data","background_color":"yellow","font_size":"24","text_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":803122310080746,"layout":{"x":59,"y":25,"width":16,"height":8},"definition":{"type":"note","content":"### AWS Only\nIndicates percentage of DR (Disaster Recovery) backups that have succeeded. You can view all backup logs in the Backup Monitor to investigate failures further.","background_color":"white","font_size":"14","text_align":"left","show_tick":true,"tick_pos":"50%","tick_edge":"left"}},{"id":1058098339957476,"layout":{"x":56,"y":67,"width":9,"height":6},"definition":{"title":"FSx","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_fsx_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":4879977658802298,"layout":{"x":14,"y":67,"width":10,"height":6},"definition":{"title":"EFS","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_efs_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","custom_links":[],"precision":0}},{"id":3832787504859262,"layout":{"x":0,"y":53,"width":12,"height":20},"definition":{"type":"note","content":"AWS","background_color":"vivid_orange","font_size":"24","text_align":"center","vertical_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"right","has_padding":true}},{"id":8106805195027988,"layout":{"x":0,"y":74,"width":12,"height":6},"definition":{"type":"note","content":"Azure","background_color":"blue","font_size":"24","text_align":"center","vertical_align":"center","show_tick":true,"tick_pos":"50%","tick_edge":"right","has_padding":false}},{"id":8799569878928592,"layout":{"x":14,"y":74,"width":10,"height":6},"definition":{"title":"VMs","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_virtual_machines_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":4757252460925168,"layout":{"x":25,"y":74,"width":9,"height":6},"definition":{"title":"Disks","title_size":"13","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.protected_disks_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}},{"id":2210684601100064,"layout":{"x":56,"y":74,"width":9,"height":6},"definition":{"title":"Disks","title_size":"16","title_align":"left","type":"query_value","requests":[{"q":"sum:cpm_metric.dashboard_state.snapshots_disk_num{$host,$user}","aggregator":"last"}],"autoscale":true,"text_align":"left","precision":0}}],"template_variables":[{"name":"host","default":"*","prefix":"host"},{"name":"user","default":"*","prefix":"cpm"}],"layout_type":"free","is_read_only":false,"notify_list":[],"id":"ahd-2gj-tmw"}
\ No newline at end of file
diff --git a/unifi_console/assets/dashboards/unifi_console_overview.json b/unifi_console/assets/dashboards/unifi_console_overview.json
deleted file mode 100644
index eb5669d87e..0000000000
--- a/unifi_console/assets/dashboards/unifi_console_overview.json
+++ /dev/null
@@ -1,730 +0,0 @@
-{
-    "title": "Unifi",
-    "description": "",
-    "widgets": [
-        {
-            "id": 7977185517521286,
-            "definition": {
-                "type": "image",
-                "url": "https://yt3.ggpht.com/ytc/AKedOLSz6g5qyWthgJAhSN8TL4Q9NH5uZCU58mbda0ARrQ=s900-c-k-c0x00ffffff-no-rj",
-                "sizing": "cover",
-                "has_background": true,
-                "has_border": true,
-                "vertical_align": "center",
-                "horizontal_align": "center"
-            },
-            "layout": {
-                "x": 0,
-                "y": 0,
-                "width": 2,
-                "height": 2
-            }
-        },
-        {
-            "id": 2767663292713020,
-            "definition": {
-                "title": "Sites",
-                "title_size": "16",
-                "title_align": "left",
-                "type": "check_status",
-                "check": "unifi_console.healthy",
-                "grouping": "cluster",
-                "group_by": [],
-                "tags": []
-            },
-            "layout": {
-                "x": 2,
-                "y": 0,
-                "width": 2,
-                "height": 1
-            }
-        },
-        {
-            "id": 321565434025666,
-            "definition": {
-                "title": "Satisfaction",
-                "title_size": "16",
-                "title_align": "left",
-                "type": "query_value",
-                "requests": [
-                    {
-                        "formulas": [
-                            {
-                                "formula": "clamp_min(query1, 0)"
-                            }
-                        ],
-                        "response_format": "scalar",
-                        "queries": [
-                            {
-                                "query": "avg:unifi_console.device.satisfaction{$site,$device}",
-                                "data_source": "metrics",
-                                "name": "query1",
-                                "aggregator": "avg"
-                            }
-                        ]
-                    }
-                ],
-                "autoscale": true,
-                "precision": 2
-            },
-            "layout": {
-                "x": 4,
-                "y": 0,
-                "width": 2,
-                "height": 1
-            }
-        },
-        {
-            "id": 4012179360822166,
-            "definition": {
-                "title": "Device list",
-                "title_size": "16",
-                "title_align": "left",
-                "type": "query_table",
-                "requests": [
-                    {
-                        "formulas": [
-                            {
-                                "alias": "clients",
-                                "conditional_formats": [],
-                                "limit": {
-                                    "count": 500,
-                                    "order": "desc"
-                                },
-                                "cell_display_mode": "bar",
-                                "formula": "query1"
-                            },
-                            {
-                                "alias": "mem %",
-                                "conditional_formats": [],
-                                "cell_display_mode": "bar",
-                                "formula": "query2"
-                            },
-                            {
-                                "alias": "cpu %",
-                                "conditional_formats": [],
-                                "cell_display_mode": "bar",
-                                "formula": "query3"
-                            },
-                            {
-                                "alias": "uptime",
-                                "conditional_formats": [],
-                                "cell_display_mode": "bar",
-                                "formula": "query4"
-                            }
-                        ],
-                        "response_format": "scalar",
-                        "queries": [
-                            {
-                                "query": "avg:unifi_console.device.clients{$site,$device} by {device,model,device_version,site}",
-                                "data_source": "metrics",
-                                "name": "query1",
-                                "aggregator": "max"
-                            },
-                            {
-                                "query": "avg:unifi_console.device.system.mem.pct{$site,$device} by {device,model,device_version,site}",
-                                "data_source": "metrics",
-                                "name": "query2",
-                                "aggregator": "avg"
-                            },
-                            {
-                                "query": "avg:unifi_console.device.system.cpu.pct{$site,$device} by {device,model,device_version,site}",
-                                "data_source": "metrics",
-                                "name": "query3",
-                                "aggregator": "avg"
-                            },
-                            {
-                                "query": "avg:unifi_console.device.uptime{$site,$device} by {device,model,device_version,site}",
-                                "data_source": "metrics",
-                                "name": "query4",
-                                "aggregator": "avg"
-                            }
-                        ]
-                    }
-                ],
-                "has_search_bar": "auto"
-            },
-            "layout": {
-                "x": 6,
-                "y": 0,
-                "width": 6,
-                "height": 2
-            }
-        },
-        {
-            "id": 2399503018919024,
-            "definition": {
-                "title": "Devices",
-                "title_size": "16",
-                "title_align": "left",
-                "type": "check_status",
-                "check": "unifi_console.device",
-                "grouping": "cluster",
-                "group_by": [],
-                "tags": [
-                    "*"
-                ]
-            },
-            "layout": {
-                "x": 2,
-                "y": 1,
-                "width": 2,
-                "height": 1
-            }
-        },
-        {
-            "id": 1578200262916798,
-            "definition": {
-                "title": "Clients",
-                "title_size": "16",
-                "title_align": "left",
-                "type": "query_value",
-                "requests": [
-                    {
-                        "formulas": [
-                            {
-                                "formula": "query1"
-                            }
-                        ],
-                        "response_format": "scalar",
-                        "queries": [
-                            {
-                                "query": "sum:unifi_console.device.clients{$site,$device}",
-                                "data_source": "metrics",
-                                "name": "query1",
-                                "aggregator": "max"
-                            }
-                        ]
-                    }
-                ],
-                "autoscale": true,
-                "precision": 2
-            },
-            "layout": {
-                "x": 4,
-                "y": 1,
-                "width": 2,
-                "height": 1
-            }
-        },
-        {
-            "id": 5767036182915640,
-            "definition": {
-                "title": "Uplink",
-                "type": "group",
-                "show_title": true,
-                "layout_type": "ordered",
-                "widgets": [
-                    {
-                        "id": 8472848913685068,
-                        "definition": {
-                            "title": "Uplinks",
-                            "title_size": "16",
-                            "title_align": "left",
-                            "type": "check_status",
-                            "check": "unifi_console.device.uplink",
-                            "grouping": "cluster",
-                            "group_by": [],
-                            "tags": []
-                        },
-                        "layout": {
-                            "x": 0,
-                            "y": 0,
-                            "width": 2,
-                            "height": 2
-                        }
-                    },
-                    {
-                        "id": 6627067919661530,
-                        "definition": {
-                            "title": "Up Pkts",
-                            "title_size": "16",
-                            "title_align": "left",
-                            "type": "query_value",
-                            "requests": [
-                                {
-                                    "formulas": [
-                                        {
-                                            "formula": "query1"
-                                        }
-                                    ],
-                                    "response_format": "scalar",
-                                    "queries": [
-                                        {
-                                            "query": "sum:unifi_console.device.uplink.tx_packets{$site,$device}",
-                                            "data_source": "metrics",
-                                            "name": "query1",
-                                            "aggregator": "avg"
-                                        }
-                                    ]
-                                }
-                            ],
-                            "autoscale": true,
-                            "precision": 2,
-                            "timeseries_background": {
-                                "type": "bars",
-                                "yaxis": {
-                                    "include_zero": true
-                                }
-                            }
-                        },
-                        "layout": {
-                            "x": 2,
-                            "y": 0,
-                            "width": 2,
-                            "height": 2
-                        }
-                    },
-                    {
-                        "id": 1278896061530470,
-                        "definition": {
-                            "title": "Down Pkts",
-                            "title_size": "16",
-                            "title_align": "left",
-                            "type": "query_value",
-                            "requests": [
-                                {
-                                    "formulas": [
-                                        {
-                                            "formula": "query1"
-                                        }
-                                    ],
-                                    "response_format": "scalar",
-                                    "queries": [
-                                        {
-                                            "query": "sum:unifi_console.device.uplink.rx_packets{$site,$device}",
-                                            "data_source": "metrics",
-                                            "name": "query1",
-                                            "aggregator": "avg"
-                                        }
-                                    ]
-                                }
-                            ],
-                            "autoscale": true,
-                            "precision": 2,
-                            "timeseries_background": {
-                                "type": "bars",
-                                "yaxis": {
-                                    "include_zero": true
-                                }
-                            }
-                        },
-                        "layout": {
-                            "x": 4,
-                            "y": 0,
-                            "width": 2,
-                            "height": 2
-                        }
-                    },
-                    {
-                        "id": 8648497523113526,
-                        "definition": {
-                            "title": "Up Bytes",
-                            "title_size": "16",
-                            "title_align": "left",
-                            "type": "query_value",
-                            "requests": [
-                                {
-                                    "formulas": [
-                                        {
-                                            "formula": "query1"
-                                        }
-                                    ],
-                                    "response_format": "scalar",
-                                    "queries": [
-                                        {
-                                            "query": "sum:unifi_console.device.uplink.tx_bytes{$site,$device}",
-                                            "data_source": "metrics",
-                                            "name": "query1",
-                                            "aggregator": "avg"
-                                        }
-                                    ]
-                                }
-                            ],
-                            "autoscale": true,
-                            "precision": 2,
-                            "timeseries_background": {
-                                "type": "bars",
-                                "yaxis": {
-                                    "include_zero": true
-                                }
-                            }
-                        },
-                        "layout": {
-                            "x": 2,
-                            "y": 2,
-                            "width": 2,
-                            "height": 2
-                        }
-                    },
-                    {
-                        "id": 3183031128241442,
-                        "definition": {
-                            "title": "Down Bytes",
-                            "title_size": "16",
-                            "title_align": "left",
-                            "type": "query_value",
-                            "requests": [
-                                {
-                                    "formulas": [
-                                        {
-                                            "formula": "query1"
-                                        }
-                                    ],
-                                    "response_format": "scalar",
-                                    "queries": [
-                                        {
-                                            "query": "sum:unifi_console.device.uplink.rx_bytes{$site,$device}",
-                                            "data_source": "metrics",
-                                            "name": "query1",
-                                            "aggregator": "avg"
-                                        }
-                                    ]
-                                }
-                            ],
-                            "autoscale": true,
-                            "precision": 2,
-                            "timeseries_background": {
-                                "type": "bars",
-                                "yaxis": {
-                                    "include_zero": true
-                                }
-                            }
-                        },
-                        "layout": {
-                            "x": 4,
-                            "y": 2,
-                            "width": 2,
-                            "height": 2
-                        }
-                    }
-                ]
-            },
-            "layout": {
-                "x": 0,
-                "y": 0,
-                "width": 6,
-                "height": 5,
-                "is_column_break": true
-            }
-        },
-        {
-            "id": 7292902745619790,
-            "definition": {
-                "title": "Stats",
-                "type": "group",
-                "show_title": true,
-                "layout_type": "ordered",
-                "widgets": [
-                    {
-                        "id": 7509019081862604,
-                        "definition": {
-                            "title": "RX stats",
-                            "title_size": "16",
-                            "title_align": "left",
-                            "type": "query_table",
-                            "requests": [
-                                {
-                                    "formulas": [
-                                        {
-                                            "alias": "bytes",
-                                            "conditional_formats": [],
-                                            "limit": {
-                                                "count": 500,
-                                                "order": "desc"
-                                            },
-                                            "cell_display_mode": "bar",
-                                            "formula": "query1"
-                                        },
-                                        {
-                                            "alias": "pkts",
-                                            "conditional_formats": [],
-                                            "cell_display_mode": "bar",
-                                            "formula": "query2"
-                                        },
-                                        {
-                                            "alias": "dropped",
-                                            "conditional_formats": [],
-                                            "cell_display_mode": "bar",
-                                            "formula": "query3"
-                                        },
-                                        {
-                                            "alias": "Errors",
-                                            "conditional_formats": [],
-                                            "cell_display_mode": "bar",
-                                            "formula": "query4"
-                                        }
-                                    ],
-                                    "response_format": "scalar",
-                                    "queries": [
-                                        {
-                                            "query": "avg:unifi_console.device.rx_bytes{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query1",
-                                            "aggregator": "max"
-                                        },
-                                        {
-                                            "query": "avg:unifi_console.device.rx_packets{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query2",
-                                            "aggregator": "avg"
-                                        },
-                                        {
-                                            "query": "avg:unifi_console.device.rx_dropped{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query3",
-                                            "aggregator": "avg"
-                                        },
-                                        {
-                                            "query": "avg:unifi_console.device.rx_errors{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query4",
-                                            "aggregator": "avg"
-                                        }
-                                    ]
-                                }
-                            ],
-                            "has_search_bar": "auto"
-                        },
-                        "layout": {
-                            "x": 0,
-                            "y": 0,
-                            "width": 6,
-                            "height": 2
-                        }
-                    },
-                    {
-                        "id": 4392564162389202,
-                        "definition": {
-                            "title": "TX stats",
-                            "title_size": "16",
-                            "title_align": "left",
-                            "type": "query_table",
-                            "requests": [
-                                {
-                                    "formulas": [
-                                        {
-                                            "alias": "bytes",
-                                            "conditional_formats": [],
-                                            "limit": {
-                                                "count": 500,
-                                                "order": "desc"
-                                            },
-                                            "cell_display_mode": "bar",
-                                            "formula": "query1"
-                                        },
-                                        {
-                                            "alias": "pkts",
-                                            "conditional_formats": [],
-                                            "cell_display_mode": "bar",
-                                            "formula": "query2"
-                                        },
-                                        {
-                                            "alias": "dropped",
-                                            "conditional_formats": [],
-                                            "cell_display_mode": "bar",
-                                            "formula": "query3"
-                                        },
-                                        {
-                                            "alias": "Errors",
-                                            "conditional_formats": [],
-                                            "cell_display_mode": "bar",
-                                            "formula": "query4"
-                                        },
-                                        {
-                                            "alias": "Retries",
-                                            "conditional_formats": [],
-                                            "cell_display_mode": "bar",
-                                            "formula": "query5"
-                                        }
-                                    ],
-                                    "response_format": "scalar",
-                                    "queries": [
-                                        {
-                                            "query": "avg:unifi_console.device.tx_bytes{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query1",
-                                            "aggregator": "max"
-                                        },
-                                        {
-                                            "query": "avg:unifi_console.device.tx_packets{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query2",
-                                            "aggregator": "avg"
-                                        },
-                                        {
-                                            "query": "avg:unifi_console.device.tx_dropped{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query3",
-                                            "aggregator": "avg"
-                                        },
-                                        {
-                                            "query": "avg:unifi_console.device.tx_errors{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query4",
-                                            "aggregator": "avg"
-                                        },
-                                        {
-                                            "query": "avg:unifi_console.device.tx_retries{$site,$device} by {device,model,device_version,site}",
-                                            "data_source": "metrics",
-                                            "name": "query5",
-                                            "aggregator": "avg"
-                                        }
-                                    ]
-                                }
-                            ],
-                            "has_search_bar": "auto"
-                        },
-                        "layout": {
-                            "x": 0,
-                            "y": 2,
-                            "width": 6,
-                            "height": 2
-                        }
-                    }
-                ]
-            },
-            "layout": {
-                "x": 6,
-                "y": 0,
-                "width": 6,
-                "height": 5
-            }
-        },
-        {
-            "id": 4501567618607254,
-            "definition": {
-                "title": "Clients / Channel",
-                "title_size": "16",
-                "title_align": "left",
-                "requests": [
-                    {
-                        "formulas": [
-                            {
-                                "formula": "query1",
-                                "limit": {
-                                    "order": "desc"
-                                }
-                            }
-                        ],
-                        "response_format": "scalar",
-                        "queries": [
-                            {
-                                "query": "sum:unifi_console.client.up{*} by {channel}",
-                                "data_source": "metrics",
-                                "name": "query1",
-                                "aggregator": "avg"
-                            }
-                        ]
-                    }
-                ],
-                "type": "sunburst",
-                "legend": {
-                    "type": "table"
-                }
-            },
-            "layout": {
-                "x": 0,
-                "y": 0,
-                "width": 4,
-                "height": 4
-            }
-        },
-        {
-            "id": 6118449973965316,
-            "definition": {
-                "title": "Clients / OUI",
-                "title_size": "16",
-                "title_align": "left",
-                "requests": [
-                    {
-                        "formulas": [
-                            {
-                                "formula": "query1",
-                                "limit": {
-                                    "order": "desc"
-                                }
-                            }
-                        ],
-                        "response_format": "scalar",
-                        "queries": [
-                            {
-                                "query": "sum:unifi_console.client.up{*} by {oui}",
-                                "data_source": "metrics",
-                                "name": "query1",
-                                "aggregator": "avg"
-                            }
-                        ]
-                    }
-                ],
-                "type": "sunburst",
-                "legend": {
-                    "type": "table"
-                }
-            },
-            "layout": {
-                "x": 4,
-                "y": 0,
-                "width": 4,
-                "height": 4
-            }
-        },
-        {
-            "id": 2776352062336068,
-            "definition": {
-                "title": "Clients / Radio",
-                "title_size": "16",
-                "title_align": "left",
-                "requests": [
-                    {
-                        "formulas": [
-                            {
-                                "formula": "query1",
-                                "limit": {
-                                    "order": "desc"
-                                }
-                            }
-                        ],
-                        "response_format": "scalar",
-                        "queries": [
-                            {
-                                "query": "sum:unifi_console.client.up{*} by {radio_name}",
-                                "data_source": "metrics",
-                                "name": "query1",
-                                "aggregator": "avg"
-                            }
-                        ]
-                    }
-                ],
-                "type": "sunburst",
-                "legend": {
-                    "type": "table"
-                }
-            },
-            "layout": {
-                "x": 8,
-                "y": 0,
-                "width": 4,
-                "height": 4
-            }
-        }
-    ],
-    "template_variables": [
-        {
-            "name": "site",
-            "prefix": "site",
-            "available_values": [],
-            "default": "*"
-        },
-        {
-            "name": "device",
-            "prefix": "device",
-            "available_values": [],
-            "default": "*"
-        }
-    ],
-    "layout_type": "ordered",
-    "is_read_only": false,
-    "notify_list": [],
-    "reflow_type": "fixed"
-}
\ No newline at end of file
diff --git a/zabbix/assets/dashboards/zabbix_overview.json b/zabbix/assets/dashboards/zabbix_overview.json
deleted file mode 100644
index e69de29bb2..0000000000