Skip to content

Commit

Permalink
Add possibility of embedding cost report in hermes-console (#1734)
Browse files Browse the repository at this point in the history
  • Loading branch information
@piotrrzysko
piotrrzysko authored Oct 19, 2023
1 parent cfa050f commit cffefa7
Show file tree
Hide file tree
Showing 7 changed files with 136 additions and 7 deletions.
5 changes: 4 additions & 1 deletion hermes-console/static/js/console/Home.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ home.controller('HomeController', ['$scope', 'DASHBOARD_CONFIG', function($scope

$scope.statsDashboard = config.metrics;
$scope.docs = config.docs;

$scope.costs = {
detailsUrl: window.config.costs.globalDetailsUrl,
enabled: window.config.costs.enabled
};
}]);
25 changes: 20 additions & 5 deletions hermes-console/static/js/console/subscription/SubscriptionController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,26 @@ var subscriptions = angular.module('hermes.subscription', [

subscriptions.controller('SubscriptionController', ['SubscriptionRepository', 'SubscriptionHealth', 'SubscriptionMetrics',
'TopicRepository', 'TopicMetrics', '$scope', '$location', '$stateParams', '$uibModal', '$q', 'ConfirmationModal',
'toaster', 'PasswordService', 'MessagePreviewModal', 'FiltersDebuggerModalFactory', 'SUBSCRIPTION_CONFIG',
'toaster', 'PasswordService', 'MessagePreviewModal', 'FiltersDebuggerModalFactory', 'SUBSCRIPTION_CONFIG', '$sce',
function (subscriptionRepository, subscriptionHealth, subscriptionMetrics, topicRepository, topicMetrics,
$scope, $location, $stateParams, $modal, $q, confirmationModal, toaster, passwordService,
messagePreviewModal, filtersDebuggerModal, config) {
messagePreviewModal, filtersDebuggerModal, config, $sce) {
var groupName = $scope.groupName = $stateParams.groupName;
var topicName = $scope.topicName = $stateParams.topicName;
var subscriptionName = $scope.subscriptionName = $stateParams.subscriptionName;
$scope.config = config;
$scope.costs = {
enabled: window.config.costs.enabled,
iframeUrl: $sce.trustAsResourceUrl(resolveCostsUrl(window.config.costs.subscriptionIframeUrl)),
detailsUrl: resolveCostsUrl(window.config.costs.subscriptionDetailsUrl)
};

function resolveCostsUrl(template) {
if (template) {
return template.replace('{{topic_name}}', topicName).replace('{{subscription_name}}', subscriptionName);
}
return template;
}

function getUndelivered() {
subscriptionRepository.undelivered(topicName, subscriptionName).$promise
Expand Down Expand Up @@ -276,8 +288,8 @@ subscriptions.controller('SubscriptionController', ['SubscriptionRepository', 'S
});
};
$scope.skipMessages = function (){
tommorowDate = new Date()
tommorowDate.setDate(tommorowDate.getDate() + 1)
tommorowDate = new Date();
tommorowDate.setDate(tommorowDate.getDate() + 1);

confirmationModal.open({
action: 'Skip messages',
Expand All @@ -299,7 +311,7 @@ subscriptions.controller('SubscriptionController', ['SubscriptionRepository', 'S
});
});

}
};
$scope.debugFilters = function () {
filtersDebuggerModal.open(topicName, $scope.subscription.filters, $scope.topicContentType)
.then(function (result) {
Expand All @@ -311,6 +323,9 @@ subscriptions.controller('SubscriptionController', ['SubscriptionRepository', 'S

$scope.trackingModeName = {"trackingOff": "No tracking", "discardedOnly": "Track message discarding only", "trackingAll": "Track everything"};

$scope.goToCostDetails = function () {
window.open($scope.costs.detailsUrl, '_blank');
};
}]);

subscriptions.controller('SubscriptionEditController', ['SubscriptionRepository', '$scope', '$uibModalInstance', 'subscription',
Expand Down
16 changes: 16 additions & 0 deletions hermes-console/static/js/console/topic/TopicController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ topics.controller('TopicController', ['TOPIC_CONFIG', 'TopicRepository', 'TopicM
$scope.showHeadersFilter = subscriptionConfig.showHeadersFilter;
$scope.offlineRetransmissionEnabled = topicConfig.offlineRetransmissionEnabled;
$scope.iframeSource = "";
$scope.costs = {
enabled: window.config.costs.enabled,
iframeUrl: $sce.trustAsResourceUrl(resolveCostsUrl(window.config.costs.topicIframeUrl)),
detailsUrl: resolveCostsUrl(window.config.costs.topicDetailsUrl)
};

function resolveCostsUrl(template) {
if (template) {
return template.replace('{{topic_name}}', topicName);
}
return template;
}

topicRepository.get(topicName).then(function(topicWithSchema) {
$scope.topic = topicWithSchema;
Expand Down Expand Up @@ -288,6 +300,10 @@ topics.controller('TopicController', ['TOPIC_CONFIG', 'TopicRepository', 'TopicM
}
});
};

$scope.goToCostDetails = function () {
window.open($scope.costs.detailsUrl, '_blank');
};
}]);

topics.controller('TopicEditController', ['TOPIC_CONFIG', 'TopicRepository', '$scope', '$uibModalInstance', 'PasswordService',
Expand Down
7 changes: 6 additions & 1 deletion hermes-console/static/partials/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
</div>

<div class="row" style="margin-bottom: 2em;">
<div class="col-md-6 col-md-offset-3">
<div class="col-md-{{costs.enabled ? 3 : 6}} col-md-offset-3">
<a class="btn btn-main btn-block" ng-href="#/groups">
<i class="fa fa-cogs"></i> Console
</a>
</div>
<div class="col-md-3" ng-if="costs.enabled">
<a class="btn btn-main btn-block" ng-href="{{costs.detailsUrl}}" target="_blank">
<i class="fa fa-money"></i> Costs
</a>
</div>
</div>

<div class="row" style="margin-bottom: 2em;">
Expand Down
13 changes: 13 additions & 0 deletions hermes-console/static/partials/subscription.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,19 @@ <h3 class="panel-title">Service response metrics</h3>
<p><strong><a ng-href="{{metricsUrls.networkErrors}}">Other network errors</a></strong></p>
</div>
</div>

<div class="panel panel-info" ng-if="costs.enabled">
<div class="panel-heading">
<div class="pull-right">
<button class="btn btn-primary btn-xs" ng-click="goToCostDetails()">Go to details</button>
</div>
<h3 class="panel-title">Costs</h3>
</div>
<div class="panel-body">
<iframe height="100%" width="100%" style="border: none;" ng-src="{{costs.iframeUrl}}"></iframe>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Manage subscription messages</h3>
Expand Down
11 changes: 11 additions & 0 deletions hermes-console/static/partials/topic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,17 @@ <h3 class="panel-title">Metrics</h3>
<p><strong><a ng-href="{{metricsUrls.messageSize}}">Message size</a></strong></p>
</div>
</div>
<div ng-if="costs.enabled" class="panel panel-info">
<div class="panel-heading">
<div class="pull-right">
<button class="btn btn-primary btn-xs" ng-click="goToCostDetails()">Go to details</button>
</div>
<h3 class="panel-title">Costs</h3>
</div>
<div class="panel-body">
<iframe height="100%" width="100%" style="border: none;" ng-src="{{costs.iframeUrl}}"></iframe>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
Expand Down
66 changes: 66 additions & 0 deletions ...ent/src/main/java/pl/allegro/tech/hermes/management/config/console/ConsoleProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class ConsoleProperties {
private SubscriptionView subscription = new SubscriptionView();
private ConsistencyView consistency = new ConsistencyView();
private GroupView group = new GroupView();
private Costs costs = new Costs();

public Dashboard getDashboard() {
return dashboard;
Expand Down Expand Up @@ -82,6 +83,14 @@ public void setGroup(GroupView group) {
this.group = group;
}

public Costs getCosts() {
return costs;
}

public void setCosts(Costs costs) {
this.costs = costs;
}

public static final class Console {
private String title = "hermes console";
private String footer = "";
Expand Down Expand Up @@ -834,4 +843,61 @@ public void setMaxGroupBatchSize(int maxGroupBatchSize) {
this.maxGroupBatchSize = maxGroupBatchSize;
}
}

public static final class Costs {
private boolean enabled = false;
private String globalDetailsUrl = "";
private String topicIframeUrl = "";
private String topicDetailsUrl = "";
private String subscriptionIframeUrl = "";
private String subscriptionDetailsUrl = "";

public boolean isEnabled() {
return enabled;
}

public void setEnabled(boolean enabled) {
this.enabled = enabled;
}

public String getTopicIframeUrl() {
return topicIframeUrl;
}

public void setTopicIframeUrl(String topicIframeUrl) {
this.topicIframeUrl = topicIframeUrl;
}

public String getGlobalDetailsUrl() {
return globalDetailsUrl;
}

public void setGlobalDetailsUrl(String globalDetailsUrl) {
this.globalDetailsUrl = globalDetailsUrl;
}

public String getTopicDetailsUrl() {
return topicDetailsUrl;
}

public void setTopicDetailsUrl(String topicDetailsUrl) {
this.topicDetailsUrl = topicDetailsUrl;
}

public String getSubscriptionIframeUrl() {
return subscriptionIframeUrl;
}

public void setSubscriptionIframeUrl(String subscriptionIframeUrl) {
this.subscriptionIframeUrl = subscriptionIframeUrl;
}

public String getSubscriptionDetailsUrl() {
return subscriptionDetailsUrl;
}

public void setSubscriptionDetailsUrl(String subscriptionDetailsUrl) {
this.subscriptionDetailsUrl = subscriptionDetailsUrl;
}
}
}

0 comments on commit cffefa7

Please sign in to comment.