~ubuntu-branches/ubuntu/vivid/ceilometer/vivid

« back to all changes in this revision

Viewing changes to ceilometer/alarm/notifier/log.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-02-19 14:59:07 UTC
  • mfrom: (1.2.3)
  • Revision ID: package-import@ubuntu.com-20150219145907-9jojybdsl64zcn14
Tags: 2015.1~b2-0ubuntu1
[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/p/skip-test.patch: Rebased.

[ James Page ]
* d/rules,d/p/skip-gabbi.patch: Skip tests that rely on python-gabbi until
  packaging and MIR is complete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#
2
2
# Copyright 2013 eNovance
3
3
#
4
 
# Author: Julien Danjou <julien@danjou.info>
5
 
#
6
4
# Licensed under the Apache License, Version 2.0 (the "License"); you may
7
5
# not use this file except in compliance with the License. You may obtain
8
6
# a copy of the License at
27
25
    "Log alarm notifier."""
28
26
 
29
27
    @staticmethod
30
 
    def notify(action, alarm_id, alarm_name, previous, current, reason,
31
 
               reason_data):
 
28
    def notify(action, alarm_id, alarm_name, severity, previous, current,
 
29
               reason, reason_data):
32
30
        LOG.info(_(
33
 
            "Notifying alarm %(alarm_name)s %(alarm_id)s from %(previous)s "
34
 
            "to %(current)s with action %(action)s because "
35
 
            "%(reason)s.") % ({'alarm_name': alarm_name, 'alarm_id': alarm_id,
36
 
                               'previous': previous, 'current': current,
37
 
                               'action': action, 'reason': reason}))
 
31
            "Notifying alarm %(alarm_name)s %(alarm_id)s of %(severity)s "
 
32
            "priority from %(previous)s to %(current)s with action %(action)s"
 
33
            " because %(reason)s.") % ({'alarm_name': alarm_name,
 
34
                                        'alarm_id': alarm_id,
 
35
                                        'severity': severity,
 
36
                                        'previous': previous,
 
37
                                        'current': current,
 
38
                                        'action': action,
 
39
                                        'reason': reason}))