← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/storage/impl_log.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2014-03-06 14:44:28 UTC
  • mto: (28.1.1 utopic-proposed) (1.2.1)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: package-import@ubuntu.com-20140306144428-rvphsh4igwyulzf0
Tags: upstream-2014.1~b3
Import upstream version 2014.1~b3

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/storage/impl_log.py
115
115
        """Return an iterable of dictionaries containing meter information.
116
116
 
117
117
        { 'name': name of the meter,
118
 
          'type': type of the meter (guage, counter),
 
118
          'type': type of the meter (gauge, delta, cumulative),
119
119
          'resource_id': UUID of the resource,
120
120
          'project_id': UUID of project owning the resource,
121
121
          'user_id': UUID of user owning the resource,
137
137
        """
138
138
        return []
139
139
 
140
 
    def get_meter_statistics(self, sample_filter, period=None, groupby=None):
 
140
    def get_meter_statistics(self, sample_filter, period=None, groupby=None,
 
141
                             aggregate=None):
141
142
        """Return a dictionary containing meter statistics.
142
143
        described by the query parameters.
143
144
 
176
177
        return alarm
177
178
 
178
179
    def delete_alarm(self, alarm_id):
179
 
        """Delete a alarm."""
 
180
        """Delete an alarm."""