This repository has been archived by the owner on Nov 9, 2017. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'HAWKULAR-806' of https://github.com/Jiri-Kremser/hawkular…
… into Jiri-Kremser-HAWKULAR-806
- Loading branch information
Showing
9 changed files
with
381 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
console/src/main/scripts/plugins/metrics/html/agent-installer.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| <div ng-controller="AgentInstallerController as aic" class="hk-agent-installer"> | ||
| <div class="hk-heading"> | ||
| <h1>Agent Installer</h1> | ||
| </div> | ||
|
|
||
| <div class="container"> | ||
|
|
||
| <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="hawkular-server-url">Hawkular Server URL</label> | ||
|
|
||
| <div class="col-sm-5"> | ||
| <div class="hk-input-text"> | ||
| <input class="form-control" type="url" ng-model="aic.hawkularServerUrl" | ||
| placeholder="URL of Hawkular (e.g.: http://localhost:8080)" required hk-autofocus | ||
| id="hawkular-server-url"/> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <div class="row"> | ||
| <label class="col-sm-3 control-label" for="wildfly-home">Wildfly Home</label> | ||
|
|
||
| <div class="col-sm-5"> | ||
| <div class="input-group"> | ||
| <input ng-model="aic.wildflyHome" | ||
| class="form-control" id="wildfly-home"/> | ||
|
|
||
| <span class="btn btn-primary btn-file "> | ||
| Browse <input type="file" webkitdirectory directory multiple/> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
| <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</label> | ||
|
|
||
| <div class="col-sm-5"> | ||
| <div class="input-group"> | ||
| <input ng-model="aic.moduleZip" class="form-control" id="module-zip"/> | ||
| <span class="btn btn-primary btn-file "> | ||
| Browse <input type="file"/> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
| <div class="form-group"> | ||
| <div class="row"> | ||
| <label class="col-sm-3 control-label" for="username">Username</label> | ||
|
|
||
| <div class="col-sm-5"> | ||
| <div class="hk-input-text"> | ||
| <input class="form-control" ng-model="aic.username" id="username"/> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <div class="row"> | ||
| <label class="col-sm-3 control-label" for="password">Password</label> | ||
|
|
||
| <div class="col-sm-5"> | ||
| <div class="hk-input-text"> | ||
| <input class="form-control" type="password" ng-model="aic.password" id="password"/> | ||
| </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> | ||
| </div> | ||
| </div> | ||
|
|
||
| </fieldset> | ||
| </form> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
console/src/main/scripts/plugins/metrics/ts/agentInstaller.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /// | ||
| /// Copyright 2015 Red Hat, Inc. and/or its affiliates | ||
| /// and other contributors as indicated by the @author tags. | ||
| /// | ||
| /// Licensed under the Apache License, Version 2.0 (the "License"); | ||
| /// you may not use this file except in compliance with the License. | ||
| /// You may obtain a copy of the License at | ||
| /// | ||
| /// http://www.apache.org/licenses/LICENSE-2.0 | ||
| /// | ||
| /// Unless required by applicable law or agreed to in writing, software | ||
| /// distributed under the License is distributed on an "AS IS" BASIS, | ||
| /// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| /// See the License for the specific language governing permissions and | ||
| /// limitations under the License. | ||
| /// | ||
|
|
||
| /// <reference path='metricsPlugin.ts'/> | ||
| /// <reference path='services/notificationsService.ts'/> | ||
|
|
||
| module HawkularMetrics { | ||
|
|
||
| export class AgentInstallerController { | ||
|
|
||
| private httpUriPart = 'http://'; | ||
| private hawkularServerUrl: string; | ||
| private wildflyHome: string; | ||
| private moduleZip: string; | ||
|
|
||
| private username: string; | ||
| private password: string; | ||
|
|
||
| constructor(private $location:ng.ILocationService, | ||
| private $scope:any, | ||
| private $rootScope:any, | ||
| private $log:ng.ILogService, | ||
| private $modal:any, | ||
| private NotificationsService:INotificationsService) { | ||
| $scope.aic = this; | ||
| this.hawkularServerUrl = this.httpUriPart; | ||
| } | ||
|
|
||
| public requiredFieldsFilled(hawkularServerUrl: string, wildflyHome: string): boolean { | ||
| return this.hawkularServerUrl !== undefined | ||
| && ((this.hawkularServerUrl.slice(0, 7) === 'http://' && this.hawkularServerUrl.length > 7) | ||
| || (this.hawkularServerUrl.slice(0, 8) === 'https://' && this.hawkularServerUrl.length > 8)) | ||
| && this.wildflyHome !== undefined && this.wildflyHome.length > 2; | ||
| } | ||
|
|
||
| public download(): void { | ||
| var newPath = '/hawkular/wildfly-agent/download?installer=true&wildfly-home=' | ||
| + encodeURIComponent(this.wildflyHome) + '&hawkular-server-url=' + encodeURIComponent(this.hawkularServerUrl); | ||
| if (this.moduleZip) { | ||
| newPath += '&module-zip=' + encodeURIComponent(this.moduleZip); | ||
| } | ||
| if (this.username) { | ||
| newPath += '&username=' + encodeURIComponent(this.username); | ||
| } | ||
| if (this.password) { | ||
| newPath += '&password=' + encodeURIComponent(this.password); | ||
| } | ||
| this.$log.info('downloading agent installer..'); | ||
| window.location.href = newPath; | ||
| } | ||
|
|
||
| } | ||
| _module.controller('AgentInstallerController', AgentInstallerController); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.