diff --git a/packaging/release_process.md b/packaging/release_process.md new file mode 100644 index 00000000000..645a86d8f4a --- /dev/null +++ b/packaging/release_process.md @@ -0,0 +1,13 @@ +# New Grafana Release Processes + +## Building release packages + +1) Update package.json so that it has the right version. +2) Packages from master a built automatically by circle CI for this repo [grafana/grafana-packer](https://github.com/grafana/grafana-packer) + +### Non master branch + +When building from non master branch create a new branch in repo [grafana/grafana-packer](https://github.com/grafana/grafana-packer) +and configure circle.yml to deploy that branch as well, https://github.com/grafana/grafana-packer/blob/master/circle.yml#L25 + + diff --git a/public/app/features/alerting/alert_log_ctrl.ts b/public/app/features/alerting/alert_log_ctrl.ts deleted file mode 100644 index 5ef79b9e53f..00000000000 --- a/public/app/features/alerting/alert_log_ctrl.ts +++ /dev/null @@ -1,37 +0,0 @@ -/// - -import angular from 'angular'; -import _ from 'lodash'; -import coreModule from '../../core/core_module'; -import config from 'app/core/config'; -import alertDef from './alert_def'; -import moment from 'moment'; - -export class AlertLogCtrl { - - alertLogs: any; - alert: any; - - /** @ngInject */ - constructor(private $route, private backendSrv) { - if ($route.current.params.alertId) { - this.loadAlertLogs($route.current.params.alertId); - } - } - - loadAlertLogs(alertId: number) { - this.backendSrv.get(`/api/alerts/${alertId}/states`).then(result => { - this.alertLogs = _.map(result, log => { - log.iconCss = alertDef.getSeverityIconClass(log.severity); - log.humanTime = moment(log.created).format("YYYY-MM-DD HH:mm:ss"); - return log; - }); - }); - - this.backendSrv.get(`/api/alerts/${alertId}`).then(result => { - this.alert = result; - }); - } -} - -coreModule.controller('AlertLogCtrl', AlertLogCtrl); diff --git a/public/app/features/alerting/all.ts b/public/app/features/alerting/all.ts index feb297c0867..01c93ec3581 100644 --- a/public/app/features/alerting/all.ts +++ b/public/app/features/alerting/all.ts @@ -1,5 +1,4 @@ import './alert_list_ctrl'; -import './alert_log_ctrl'; import './notifications_list_ctrl'; import './notification_edit_ctrl'; diff --git a/public/app/features/alerting/partials/alert_log.html b/public/app/features/alerting/partials/alert_log.html deleted file mode 100644 index 921f748da76..00000000000 --- a/public/app/features/alerting/partials/alert_log.html +++ /dev/null @@ -1,29 +0,0 @@ - - - -
- - - - - - - - - - - - - -
StatusTimeDescription
- - - {{alertLog.humanTime}} - - {{alertLog.info}} -
-
- -