9b3a266817
Merge remote-tracking branch 'origin/keithcraig-integration' into alphonzo79-data-initialization-bug-fix
2015-10-08 11:02:55 -06:00
47a2c13b53
Merge remote-tracking branch 'origin/vertigo-davidb-localization-fixes' into keithcraig-integration
...
Conflicts:
DeviceAdministration/Infrastructure/Repository/AlertsRepository.cs
DeviceAdministration/Web/Content/screen.css.map
DeviceAdministration/Web/Content/screen.min.css
DeviceAdministration/Web/Controllers/DeviceRulesController.cs
EventProcessor/EventProcessor.WorkerRole/Processors/DeviceEventProcessor.cs
EventProcessor/EventProcessor.WorkerRole/WorkerRole.cs
Simulator/Simulator.WorkerRole/WorkerRole.cs
2015-10-08 09:07:11 -07:00
3ca565624f
Check for a shutdown signal in the webjob program before initializing data
...
We have seen intermittent cases where a couple of devices would be
bootstrapped, then about 7 seconds later four more devices. After some
investigation we found that on every fresh cloud deploy the web job would
go through two starts -- we suspect this is as it goes through the
staging, warmup and swap to production.
To avoid letting this happen we will watch the location of the shutdown
file that is created when shutdown is scheduled. If we see that before we
enter the initialization method then we will skip initialization since it
will likely be aborted mid-process.
In Debugging we have sometimes seen cases where initialization is started,
then the shutdown signal is immediatly received. However, in these cases
initialization has been able to complete successfully.
It may not be a perfect solution, but for now I think it's pretty solid.
2015-10-08 08:59:56 -06:00
34bdd3767f
Add settings.job file to make the webjob Singleton
2015-10-07 18:57:42 -06:00
02df4543f1
Merge remote-tracking branch 'origin/krangel-copy-text-content-for-mac' into keithcraig-integration
...
Conflicts:
DeviceAdministration/Web/App_GlobalResources/Strings.resx
2015-10-07 16:56:08 -07:00
bd9bc46159
Merge remote-tracking branch 'origin/krangel-localize-display-roles' into keithcraig-integration
...
Conflicts:
DeviceAdministration/Web/App_GlobalResources/Strings.resx
2015-10-07 16:52:08 -07:00
ddcc597798
Merge remote-tracking branch 'origin/keithcraig-fix-alerts-bugs-new-sql' into keithcraig-integration
2015-10-07 16:48:47 -07:00
f46849da5b
Merge remote-tracking branch 'origin/alphonzo79-device-rule-update-conflict-bug-fix' into keithcraig-integration
2015-10-07 16:46:00 -07:00
96b34870d5
Merge remote-tracking branch 'origin/alphonzo79-delete-rules-feature' into keithcraig-integration
2015-10-07 16:42:56 -07:00
8ec2650cdc
Merge remote-tracking branch 'origin/alphonzo79-remove-dead-worker-role-code' into keithcraig-integration
2015-10-07 16:37:37 -07:00
6bce6d4452
Address WebApiControllerBase Error Handling Issues
2015-10-07 15:29:06 -07:00
fb20dbf1fb
Merge branch 'keithcraig-integration' into alphonzo79-map-data-flow-refactor
2015-10-07 14:41:54 -07:00
6a82f63f69
Update data flow of dashboard
2015-10-07 14:41:46 -07:00
e2b4acd394
Merge branch 'keithcraig-integration' into alphonzo79-dashboard-interactive-enhancements
2015-10-07 14:32:38 -07:00
5bf34f06f4
Various dashboard enhancements
...
* Fix styling issue on info box for pins
* Clicking pin selects that device for
telemetry graphs and gauges
* Selecting device highlights rows in
alerts table for that device
* Color-code map pins based on alerts
2015-10-07 14:32:28 -07:00
91e26654e7
Merge branch 'keithcraig-integration' into krangel-localization-styling-changes
2015-10-07 14:20:19 -07:00
4711850841
Various localization styling and string changes
...
* Rework styles for more layout flexibility with
changing string lengths
* Localize a few strings in JS
2015-10-07 14:20:10 -07:00
190287a44f
Merge branch 'keithcraig-integration' into krangel-add-status-dots-to-rules-grid
2015-10-07 14:13:30 -07:00
a47751faa3
Add status dots to rules table
...
* Refactor existing style names to
make them more generic
* Remove dead styles
2015-10-07 14:13:22 -07:00
f740f197bb
Merge branch 'keithcraig-integration' into krangel-copy-text-content-for-mac
2015-10-07 14:10:09 -07:00
eece6903a7
Add Mac-specific copy text content
...
Previously, we displayed "Ctrl+C to copy"
for all computing platforms. We now display
"Command+C to copy" on Mac.
2015-10-07 14:10:00 -07:00
b10a1cf07e
Merge branch 'keithcraig-integration' into krangel-localize-display-roles
2015-10-07 14:05:51 -07:00
06816a84eb
Localize various strings
...
* Role names in header
* "Device to View:" in dashboard
* "Sign out"
2015-10-07 14:05:39 -07:00
043b80a438
Merge branch 'master' into alphonzo79-remove-dead-worker-role-code
2015-10-07 13:52:46 -07:00
69e8bbf359
Remove dead worker role code
...
This is no longer needed with the webjob.
2015-10-07 13:52:39 -07:00
480f8909b5
Merge branch 'keithcraig-integration' into keithcraig-fix-alerts-bugs-new-sql
2015-10-07 13:44:48 -07:00
218ec7411f
Restructure *alerts ASA SQL* and alerts logic
...
Fix existing bug(s?) with alerts and
simplify logic.
NOTE: This includes changes to the ASA SQL,
so it is not compatible with previous deployments,
and the associated deployment template changes need to be
used for this C# code.
2015-10-07 13:44:30 -07:00
0a310d9880
Merge branch 'master' into keithcraig-fix-event-processor-casing-bug
2015-10-07 11:52:45 -07:00
3ce59ab216
Fix for casing bug in event processor
...
The event processor hosts need the name of the
event hub in *lowercase*, but we were supplying
whatever we got from the user as part of the
RM instance name, which failed if any characters
were capitalized.
2015-10-07 11:52:33 -07:00
9c57b5f51c
Merge branch 'master' into vertigo-davidb-localization-fixes
2015-10-07 11:15:07 -07:00
d87ed3952e
Localization and related fixes
...
Also add testing .tt resources using Scott Hanselman's
pseudo-localization generator
2015-10-07 10:46:05 -07:00
e76399861c
Fix bug with rule conflicts
...
Previously, if another user changed the rule data
during an edit, the view would display a warning
but not update the data, so that the user was stuck
until they left the view. Bug fix is to update the
data to the current data after displaying the warning.
2015-10-06 17:30:38 -07:00
58f0698319
Add rule delete functionality
2015-10-06 17:15:58 -07:00
311869d72c
Updating RemoteMonitoring template to deploy from GitHub
2015-10-06 15:41:24 -07:00
8966fc6fef
Dev deployment work
2015-10-05 17:49:37 -07:00
063fda9dfd
Enabling consumer groups for IoTHub <-> ASA jobs
2015-10-05 12:38:21 -07:00
d45dd5f376
Splitting WebJobs into separate service plan and updated deployment template
2015-10-01 14:15:35 -07:00
d6e5783c3a
minor change
2015-09-28 23:51:29 -07:00
ee43e05c05
Merge branch 'master' into jamesweb-dev
2015-09-28 23:22:14 -07:00
634637230e
cleanup rtf
2015-09-28 23:17:52 -07:00
b54f469d84
update docs
2015-09-28 23:12:55 -07:00
7a1a2c5881
Initial dev cleanup
2015-09-28 23:00:34 -07:00
6fae794b96
Update custom device documentation link
2015-09-28 22:41:26 -07:00
eccaf02b8d
Initial commit
2015-09-28 21:28:36 -07:00
Joe Rowley
Keith Craig
Dave Bautista
Tyler Jensen
jamesweb-ms