2021-07-25

mobiledgex · Jul 25, 2021 · 8a98cdf · 8a98cdf
1 parent d0ed659
commit 8a98cdf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## [2021-07-25] - 2021-07-25
+[Details](../../commit/2021-07-25)
+
+### edge-cloud:
+- [EDGECLOUD-4292](https://mobiledgex.atlassian.net/browse/EDGECLOUD-4292) e2e tests code for Cluster svc alerts ([#1428](https://github.com/mobiledgex/edge-cloud/pull/1428)) (Devdatta)
+   - * [EDGECLOUD-4292](https://mobiledgex.atlassian.net/browse/EDGECLOUD-4292) Alert needs to be raised by cluster-svc when prometheus deployment fails
+   - * [EDGECLOUD-4292](https://mobiledgex.atlassian.net/browse/EDGECLOUD-4292) Alert needs to be raised by cluster-svc when prometheus deployment fails - review comments
+   - * [EDGECLOUD-4292](https://mobiledgex.atlassian.net/browse/EDGECLOUD-4292) Alert needs to be raised by cluster-svc when prometheus deployment fails - review comments2
+- [EDGECLOUD-5303](https://mobiledgex.atlassian.net/browse/EDGECLOUD-5303) [EDGECLOUD-5304](https://mobiledgex.atlassian.net/browse/EDGECLOUD-5304) error message mentions edgeproto ([#1430](https://github.com/mobiledgex/edge-cloud/pull/1430)) (Jon)
+- prometheus e2e-test fixes ([#1429](https://github.com/mobiledgex/edge-cloud/pull/1429)) (Jon)
+
+### edge-cloud-infra:
+- [EDGECLOUD-4292](https://mobiledgex.atlassian.net/browse/EDGECLOUD-4292) e2e tests code for Cluster svc alerts ([#1657](https://github.com/mobiledgex/edge-cloud-infra/pull/1657)) (Devdatta)
+   - * [EDGECLOUD-2044](https://mobiledgex.atlassian.net/browse/EDGECLOUD-2044): Suppressing show o/p for dynamic AppInst
+- [EDGECLOUD-5303](https://mobiledgex.atlassian.net/browse/EDGECLOUD-5303) [EDGECLOUD-5304](https://mobiledgex.atlassian.net/browse/EDGECLOUD-5304) error message mentions edgeproto ([#1660](https://github.com/mobiledgex/edge-cloud-infra/pull/1660)) (Jon)
+   - * [EDGECLOUD-5303](https://mobiledgex.atlassian.net/browse/EDGECLOUD-5303) [EDGECLOUD-5304](https://mobiledgex.atlassian.net/browse/EDGECLOUD-5304) error message mentions edgeproto
+- prometheus e2e-test fixes ([#1658](https://github.com/mobiledgex/edge-cloud-infra/pull/1658)) (Jon)
+
 ## [2021-07-24] - 2021-07-24
 [Details](../../commit/2021-07-24)
 

diff --git a/edge-cloud b/edge-cloud
diff --git a/edge-cloud-infra b/edge-cloud-infra
+32 −8		cli/input.go
+3 −2		cli/input_test.go
+5 −0		cloud-resource-manager/platform/fake/fake.go
+10 −6		cloudcommon/alertnames.go
+3 −0		cloudcommon/alertnames_test.go
+7 −8		cloudcommon/node/events.go
+3 −4		cloudcommon/node/events_test.go
+7 −6		cloudcommon/node/jaegersearch.go
+11 −1		cluster-svc/cluster-svc-main.go
+30 −0		controller/alert_api.go
+2 −0		controller/clusterinst_api.go
+11 −0		controller/settings_api.go
+1 −0		d-match-engine/dme-common/match-engine.go
+314 −324		edgeproto/cloudlet.pb.go
+2 −2		edgeproto/cloudlet.proto
+22 −3		edgeproto/duration_type.go
+3 −0		edgeproto/settings.go
+142 −89		edgeproto/settings.pb.go
+2 −0		edgeproto/settings.proto
+8 −32		edgeproto/timerange.go
+2 −0		gencmd/alldata.cmd.go
+5 −0		gencmd/cloudlet.cmd.go
+2 −0		gencmd/settings.cmd.go
+1 −0		setup-env/e2e-tests/data/appdata-ratelimit_show.yml
+1 −0		setup-env/e2e-tests/data/appdata_cloudlet1_moved_show.yml
+1 −0		setup-env/e2e-tests/data/appdata_clusterInst1_cloudlet1_appInst0.yml
+1 −0		setup-env/e2e-tests/data/appdata_clusterInst1_cloudlet1_appInst1_show.yml
+1 −0		setup-env/e2e-tests/data/appdata_empty.yml
+1 −0		setup-env/e2e-tests/data/appdata_no_appinst.yml
+1 −0		setup-env/e2e-tests/data/appdata_no_appinst_autoprov_show.yml
+1 −0		setup-env/e2e-tests/data/appdata_no_appinst_show.yml
+1 −0		setup-env/e2e-tests/data/appdata_show.yml
+1 −0		setup-env/e2e-tests/data/appdata_show_after_cluster_update.yml
+1 −0		setup-env/e2e-tests/data/appdata_show_after_refresh.yml
+1 −0		setup-env/e2e-tests/data/appdata_show_after_refresh_all.yml
+1 −0		setup-env/e2e-tests/data/appdata_show_prometheus_30s_interval.yml
+1 −0		setup-env/e2e-tests/data/appdata_trusted_show.yml
+1 −0		setup-env/e2e-tests/data/appdata_trustpol_incompat_rules_show.yml
+1 −0		setup-env/e2e-tests/data/crm_info.yml
+1 −0		setup-env/e2e-tests/data/influx_appdata.yml
+1 −0		setup-env/e2e-tests/data/influx_appdata_show.yml
+1 −0		setup-env/e2e-tests/data/show10.yml
+1 −0		setup-env/e2e-tests/data/show100.yml
+1 −0		setup-env/e2e-tests/data/show2.yml
+2 −0		setup-env/e2e-tests/testfiles/check_cloudlet_usage_metrics.yml
+15 −0		util/time.go
+7 −0		crm-platforms/fakeinfra/fakeinfra.go
+1 −0		e2e-tests/data/autoprov_settings_exp.yml
+1 −0		e2e-tests/data/autoprov_settings_restored_exp.yml
+1 −1		e2e-tests/data/cloudlet_tmus-cloud-1.yml
+20 −0		e2e-tests/data/clustersvc_appinst_fail_alerts_show.yml
+7 −0		e2e-tests/data/emaildata_clustersvc_appinst_alert_firing.yml
+5 −0		e2e-tests/data/mc_admin_clustersvc_appinst_alert_receiver.yml
+6 −0		e2e-tests/data/mc_admin_clustersvc_appinst_alert_receiver_show.yml
+2 −0		e2e-tests/data/mc_admin_data.yml
+1 −0		e2e-tests/data/mc_admin_show.yml
+1 −1		e2e-tests/data/mc_enabledebug_output.yml
+1 −1		e2e-tests/data/mc_showdebug_output.yml
+25 −0		e2e-tests/data/mc_user1_alert_clustersvc.yml
+3 −3		e2e-tests/data/mc_user1_cloudlet_alert_receiver.yml
+3 −3		e2e-tests/data/mc_user1_cloudlet_alert_receiver_show.yml
+1 −0		e2e-tests/data/mc_user1_cloudlet_data.yml
+1 −0		e2e-tests/data/mc_user1_data_show.yml
+17 −0		e2e-tests/data/mc_user2_create_cluster.yml
+4 −5		e2e-tests/e2e-setup/cmp.go
+3 −0		e2e-tests/int-process/services.go
+14 −2		e2e-tests/testfiles/alerttest.yml
+142 −0		e2e-tests/testfiles/alerttest_clustersvc.yml
+3 −3		e2e-tests/testfiles/autoprov.yml
+11 −10		e2e-tests/testfiles/autoscale.yml
+21 −0		e2e-tests/testfiles/mc_add_delete.yml
+9 −4		mc/mcctl/ormctl/cloudlet.mc2.go
+3 −0		mc/mcctl/ormctl/settings.mc2.go
+1 −0		mc/orm/alert.mc2.go
+4 −3		mc/orm/alertmgr/alertmgr.go
+2 −1		mc/orm/alertmgr_api.go
+2 −3		mc/orm/billing_organization.go
+117 −0		mc/orm/ctrl_test.go
+2 −3		mc/orm/flowratelimitmc.go
+2 −3		mc/orm/maxreqsratelimitmc.go
+2 −3		mc/orm/org.go
+1 −1		mc/orm/reply.go
+4 −4		mc/orm/reporter.go
+65 −12		mc/orm/server.go
+2 −3		mc/orm/user.go
+9 −10		mc/ormapi/api.go
+13 −0		shepherd/cloudlet-prom.go
+1 −1		shepherd/cluster-autoscaler.go
+4 −1		shepherd/shepherd-debug.go
+11 −3		shepherd/shepherd.go
+1 −1		shepherd/shepherd_update_test.go