Skip to content
This repository was archived by the owner on Sep 24, 2019. It is now read-only.

UI text edits #3

Merged
merged 2 commits into from
Jan 31, 2019
Merged

UI text edits #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74d698b
UI strings cleanup
Jan 30, 2019
2c2220d
Merge branch 'master' into ui-text-edits
mrzarquon Jan 31, 2019
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
12 changes: 10 additions & 2 deletions default/data/ui/nav/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<nav color="#000000">
<view name="home" default="true" label="Home" />
<nav>
<view name="puppet_enterprise__overview" default="true" label="Puppet System Overview" />
<view name="overview" default="true" label="Puppet Enterprise Overview" />
<view name="puppet_enterprise__facts" default="true" label="Puppet Facts" />
<view name="puppet_enterprise__extended_details" default="true" label="Extended Details" />
<collection label="Documentation">
<!-- <view name="data_source" /> -->
<a target="_blank" href="https://github.com/puppetlabs/SplunkAppforPuppetEnterprise/blob/master/README.md">Install and usage documentation</a>
<a target="_blank" href="https://github.com/puppetlabs/SplunkAppforPuppetEnterprise/issues">Ask a question</a>
</collection>
</nav>
6 changes: 3 additions & 3 deletions default/data/ui/views/overview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<form>
<label>Inspect Overview</label>
<description>View the latest run status for each node and focus on areas in need of attention.</description>
<description>View the latest run status for each node and focus on areas in need of attention</description>
<fieldset submitButton="false">
<input type="time" token="time_overview" searchWhenChanged="true">
<label>Time Period</label>
<label>Time range:</label>
<default>
<earliest>-60m@m</earliest>
<latest>now</latest>
</default>
</input>
<input type="dropdown" token="pe_link" searchWhenChanged="true">
<label>Puppet Enterprise Master</label>
<label>Puppet Enterprise server:</label>
<choice value="*">ALL</choice>
<prefix>source="</prefix>
<suffix>"</suffix>
Expand Down
12 changes: 6 additions & 6 deletions default/data/ui/views/puppet_enterprise__extended_details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<form>
<label>Extended Details</label>
<description>Extended Details for Configuration Runs</description>
<description>Extended details for configuration runs</description>
<fieldset submitButton="false">
<input type="time" token="Time" searchWhenChanged="true">
<label>Time</label>
<label>Time range:</label>
<default>
<earliest>-60m@m</earliest>
<latest>now</latest>
</default>
</input>
<input type="dropdown" searchWhenChanged="true" token="pe_link">
<label>Puppet Enterprise Server</label>
<label>Puppet Enterprise server:</label>
<choice value="*">ALL</choice>
<default>*</default>
<prefix>source="</prefix>
Expand All @@ -26,7 +26,7 @@
</search>
</input>
<input type="dropdown" token="node" searchWhenChanged="true">
<label>Node</label>
<label>Node:</label>
<choice value="*">ALL</choice>
<default>*</default>
<prefix>certname="</prefix>
Expand All @@ -43,7 +43,7 @@
</search>
</input>
<input type="dropdown" token="Env" searchWhenChanged="true">
<label>Environment</label>
<label>Puppet environment:</label>
<choice value="*">ALL</choice>
<default>*</default>
<prefix>environment="</prefix>
Expand All @@ -60,7 +60,7 @@
</search>
</input>
<input type="dropdown" token="class" searchWhenChanged="true">
<label>Class</label>
<label>Class:</label>
<choice value="*">ALL</choice>
<default>*</default>
<prefix>containing_class="</prefix>
Expand Down
4 changes: 2 additions & 2 deletions default/data/ui/views/puppet_enterprise__facts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<label>Puppet Facts</label>
<fieldset submitButton="false">
<input type="time" token="timerange" searchWhenChanged="true">
<label>Time Range</label>
<label>Time range:</label>
<default>
<earliest>-24h@h</earliest>
<latest>now</latest>
</default>
</input>
<input type="dropdown" searchWhenChanged="true" token="pe_link">
<label>Puppet Enterprise Server</label>
<label>Puppet Enterprise server:</label>
<choice value="*">ALL</choice>
<default>*</default>
<prefix>pe_server_url_="</prefix>
Expand Down
2 changes: 1 addition & 1 deletion default/data/ui/views/puppet_enterprise__overview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<label>System Overview</label>
<fieldset submitButton="false">
<input type="dropdown" token="pe_link" searchWhenChanged="true">
<label>Puppet Enterprise Master</label>
<label>Puppet Enterprise server:</label>
<choice value="*">ALL</choice>
<default>*</default>
<prefix>source="</prefix>
Expand Down