Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New HTML info page for Windows #483

Merged
merged 14 commits into from
May 3, 2013
+422 −29
Merged

New HTML info page for Windows #483

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0a60c90
Introduce raw version of the HTML info page
LotharSee Apr 29, 2013
3109f01
Improve status page design
LotharSee Apr 29, 2013
e320869
Fix error and no data display
LotharSee Apr 30, 2013
6351ae5
Merge branch 'master' into windows_info_page
LotharSee Apr 30, 2013
9898511
Display warnings on the info webpage
LotharSee Apr 30, 2013
cc548e1
Simplify info page design, add a link in pup
LotharSee Apr 30, 2013
d3e5bae
Add the web info page to Windows
LotharSee Apr 30, 2013
f74cabb
Many info page changes to make it work on Windows
LotharSee May 1, 2013
9a9fbd4
Add pup assets and fix info page shutdown for Windows
LotharSee May 1, 2013
dfd7d45
Update Windows packaging to include pup files
LotharSee May 1, 2013
29fa9db
Fix recursive directory packaging issue for Windows
LotharSee May 1, 2013
e5e01d9
Fix recursive directory packaging issue for Windows, for real
LotharSee May 1, 2013
5ebf91c
Add status page shortcut in Windows install directory
LotharSee May 3, 2013
ba656cf
Minor css fix for pup
LotharSee May 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add status page shortcut in Windows install directory
@LotharSee
LotharSee committed May 3, 2013
commit 5ebf91c228ca4975d992bb4ef7a0c3c6de262e04
6 changes: 6 additions & 0 deletions packaging/datadog-agent/win32/install_files/datadog-agent-status.url
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[InternetShortcut]
URL=http://localhost:17125/status
IconFile=.\pup\static\favicon.ico
IconIndex=0
IDList=
HotKey=0
2 changes: 2 additions & 0 deletions packaging/datadog-agent/win32/nsis/agent.nsi
View file
Original file line number Diff line number Diff line change
@@ -153,6 +153,7 @@ Section "Datadog Agent" SecDummy
File "..\install_files\shell.exe"
File "..\install_files\ca-certificates.crt"
File "..\install_files\datadog-cert.pem"
File "..\install_files\datadog-agent-status.url"

; Install all of the checks.d checks
File /r "..\install_files\checks.d"
@@ -205,6 +206,7 @@ Section "Uninstall"
Delete "$INSTDIR\ca-certificates.crt"
Delete "$INSTDIR\datadog-cert.pem"
Delete "$INSTDIR\license.txt"
Delete "$INSTDIR\datadog-agent-status.url"
Delete "$INSTDIR\Uninstall.exe"

RMDir "$INSTDIR"
4 changes: 4 additions & 0 deletions packaging/datadog-agent/win32/wix/agent.wxs
View file
Original file line number Diff line number Diff line change
@@ -81,6 +81,9 @@
<Component Id="license.txt" Guid="4B59F7AE-01AC-11E2-9AF6-28EC6088709B">
<File Id="license.txt" Source="$(var.InstallFiles)\license.txt" KeyPath="yes"></File>
</Component>
<Component Id="datadogagentstatus.url" Guid="B8F673AA-F5F7-4273-947A-21391678D6BD">
<File Id="datadogagentstatus.url" Source="$(var.InstallFiles)\datadog-agent-status.url" KeyPath="yes"></File>
</Component>
<Component Id="Microsoft.VC90.CRT.manifest" Guid="491C4E02-10C9-11E2-AC50-DD0B6288709B">
<File Id="Microsoft.VC90.CRT.manifest" Source="$(var.InstallFiles)\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" KeyPath="yes"></File>
</Component>
@@ -105,6 +108,7 @@
<ComponentRef Id="cacertificates.crt" />
<ComponentRef Id="datadogcert.pem" />
<ComponentRef Id="license.txt" />
<ComponentRef Id="datadogagentstatus.url" />
<ComponentRef Id="Microsoft.VC90.CRT.manifest" />
<ComponentRef Id="msvcp90.dll" />
<ComponentRef Id="msvcr90.dll" />