Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #687 from cardosogabriel/HAWKULAR-670
Browse files Browse the repository at this point in the history 
HAWKULAR-670
  • Loading branch information
@mtho11
mtho11 committed Nov 30, 2015
2 parents 2921a8d + 4e2e3e1 commit 7b22c50
Show file tree
Hide file tree
Showing 12 changed files with 396 additions and 290 deletions.
193 changes: 93 additions & 100 deletions console/src/main/scripts/plugins/metrics/html/agent-installer.html
View file
Original file line number Diff line number Diff line change
@@ -1,119 +1,112 @@
<div ng-controller="AgentInstallerController as aic" class="hk-agent-installer">
<div class="hk-heading">
<h1>Agent Installer</h1>
<h1 class="text-center">Agent Installer</h1>
</div>

<div class="container">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<div class="row row-cards-pf">
<div class="col-xs-12">
<div class="card-pf">
<div class="card-pf-body">

<div class="col-lg-9 col-md-8">
<form class="panel panel-default clearfix">
<fieldset>
<div class="panel-heading">
<h2>Required</h2>
</div>
<div class="panel-body">
<div class="form-group">
<div class="row">
<label class="col-sm-3 control-label" for="wildfly-home">Wildfly Home
<a class="hk-btn-icon" tabindex="-1" role="button" popover-append-to-body="true"
popover-placement="top" popover-trigger="mouseover mouseout"
popover="Path to your Wildfly server into which the wildfly agent should be installed.
This is the path on your monitored host.">
<i class="fa fa-info-circle"></i></a>
</label>

<div class="col-sm-5">
<div class="hk-input-text">
<input class="form-control" ng-model="aic.wildflyHome" id="wildfly-home" required hk-autofocus
placeholder="Copy&paste here the path of the Wildfly server"/>
<form class="form-horizontal">
<fieldset>
<legend>Required</legend>
<div class="form-group">
<div class="row">
<label class="col-sm-3 control-label" for="wildfly-home">Wildfly Home
<a class="hk-btn-icon" tabindex="-1" role="button" popover-append-to-body="true"
popover-placement="top" popover-trigger="mouseover mouseout"
popover="Path to your Wildfly server into which the wildfly agent should be installed.
This is the path on your monitored host.">
<i class="fa fa-info-circle"></i></a>
</label>
<div class="col-sm-5">
<div class="hk-input-text">
<input class="form-control" ng-model="aic.wildflyHome" id="wildfly-home" required hk-autofocus
placeholder="Copy&paste here the path of the Wildfly server"/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

</div>
</fieldset>

<div class="panel-heading">
<h2>Optional</h2>
</div>
<div class="panel-body">
<div class="form-group">
<div class="row">
<label class="col-sm-3 control-label" for="module-zip">Module zip
<a class="hk-btn-icon" tabindex="-1" role="button" popover-append-to-body="true"
popover-placement="top" popover-trigger="mouseover mouseout"
popover="Path to non-default zip file with agent module.
This way you can for instance deploy different version of the agent.">
<i class="fa fa-info-circle"></i></a>
</label>

<div class="col-sm-5">
<div class="hk-input-text">
<input ng-model="aic.moduleZip" class="form-control" id="module-zip"/>
<fieldset>
<legend>Optional</legend>
<div class="form-group">
<div class="row">
<label class="col-sm-3 control-label" for="module-zip">Module zip
<a class="hk-btn-icon" tabindex="-1" role="button" popover-append-to-body="true"
popover-placement="top" popover-trigger="mouseover mouseout"
popover="Path to non-default zip file with agent module.
This way you can for instance deploy different version of the agent.">
<i class="fa fa-info-circle"></i></a>
</label>
<div class="col-sm-5">
<div class="hk-input-text">
<input ng-model="aic.moduleZip" class="form-control" id="module-zip"/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>


<div class="form-group">
<div class="row">
<label class="col-sm-3 control-label" for="username">Username
<a class="hk-btn-icon" tabindex="-1" role="button" popover-append-to-body="true"
popover-placement="top" popover-trigger="mouseover mouseout"
popover="Username for this Hawkular server.">
<i class="fa fa-info-circle"></i></a>
</label>

<div class="col-sm-5">
<div class="hk-input-text">
<input class="form-control" ng-model="aic.username" id="username"
autocomplete="off"/>
<div class="form-group">
<div class="row">
<label class="col-sm-3 control-label" for="username">Username
<a class="hk-btn-icon" tabindex="-1" role="button" popover-append-to-body="true"
popover-placement="top" popover-trigger="mouseover mouseout"
popover="Username for this Hawkular server.">
<i class="fa fa-info-circle"></i></a>
</label>
<div class="col-sm-5">
<div class="hk-input-text">
<input class="form-control" ng-model="aic.username" id="username"
autocomplete="off"/>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="form-group">
<div class="row">
<label class="col-sm-3 control-label" for="password">Password
<a class="hk-btn-icon" tabindex="-1" role="button" popover-append-to-body="true"
popover-placement="top" popover-trigger="mouseover mouseout"
popover="Password for this Hawkular server.">
<i class="fa fa-info-circle"></i></a>
</label>
<div class="form-group">
<div class="row">
<label class="col-sm-3 control-label" for="password">Password
<a class="hk-btn-icon" tabindex="-1" role="button" popover-append-to-body="true"
popover-placement="top" popover-trigger="mouseover mouseout"
popover="Password for this Hawkular server.">
<i class="fa fa-info-circle"></i></a>
</label>
<div class="col-sm-5">
<div class="hk-input-text">
<input class="form-control" type="password" ng-model="aic.password" id="password"
autocomplete="off"/>
</div>
</div>
</div>
</div>
<div class="hk-form-actions-separator text-right">
<button type="button" class="btn btn-primary" ng-click="aic.download()"
ng-disabled="!aic.requiredFieldsFilled(hawkularServerUrl, wildflyHome)">
Download Installer
</button>
</div>
</fieldset>

<div class="col-sm-5">
<div class="hk-input-text">
<input class="form-control" type="password" ng-model="aic.password" id="password"
autocomplete="off"/>
<div class="code-snippet" ng-show="aic.codeSnippetShown">
To install the wildfly agent, run following command:
<!--
<div class="zero-clipboard" auto-hide-on-no-flash="true">
<span class="btn-clipboard">
Copy
</span>
</div>-->
<div class="highlight">
<pre>$ java -jar hawkular-wildfly-agent-installer-0.13.1.Final.jar</pre>
</div>
</div>
</div>
</div>

<div class="form-aictions hk-form-aictions-separator text-right">
<button type="button" class="btn btn-primary" ng-click="aic.download()"
ng-disabled="!aic.requiredFieldsFilled(hawkularServerUrl, wildflyHome)">
Download Installer
</button>
</form>
</div>
</div>

</fieldset>
<div class="code-snippet" ng-show="aic.codeSnippetShown">
To install the wildfly agent, run following command:
<!--
<div class="zero-clipboard" auto-hide-on-no-flash="true">
<span class="btn-clipboard">
Copy
</span>
</div>-->
<div class="highlight">
<pre>$ java -jar hawkular-wildfly-agent-installer-0.13.1.Final.jar</pre>
</div>
</div>
</form>
</div>
</div>
</div>

Expand Down
21 changes: 11 additions & 10 deletions console/src/main/scripts/plugins/metrics/html/alerts-center-detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@ <h1>Alert Details</h1>
</div>

<div class="container">
<div class="row row-cards-pf hk-cards-offset">

<div class="row">
<div class="col-md-9">
<div class="panel panel-default clearfix">
<div class="panel-heading">
<h2>{{acd.description | characters: 55}}</h2>
<div class="card-pf">
<div class="card-pf-heading">
<h2 class="card-pf-title">
{{acd.description | characters: 55}}
</h2>
</div>
<div class="panel-body">
<div class="card-pf-body">
<form class="form-horizontal">
<fieldset>
<div class="form-group">
Expand Down Expand Up @@ -97,11 +99,11 @@ <h2>{{acd.description | characters: 55}}</h2>
</div>

<div class="col-md-3">
<div class="panel panel-default clearfix" ng-show="acd.actionsHistory.length > 0">
<div class="panel-heading">
<h2>Notifications</h2>
<div class="card-pf card-pf-utilization">
<div class="card-pf-heading">
<h2 class="card-pf-title">Notifications</h2>
</div>
<div class="panel-body">
<div class="card-pf-body">
<div class="hk-box-v-item" ng-repeat="action in acd.actionsHistory">
<div class="hk-display-table">
<div class="hk-icon-container">
Expand All @@ -120,7 +122,6 @@ <h2>Notifications</h2>
</div>

</div>

</div>

</div>

0 comments on commit 7b22c50

Please sign in to comment.