Remove alarming code

Since we moved all the alarming code and subsystem to the Aodh project,
remove it from Ceilometer.

Depends-On: I3983128d2d964b0f1f3326948b27f5d94df65a04
Depends-On: I99c9f2be0bbc70f289da5c2ba22698b8b7dc4495
Change-Id: Id169a914c1d1f2f5ad03ebb515d3d052204d5c5c

2 files changed, 0 insertions, 43 deletions

diff --git a/ceilometer/cmd/eventlet/alarm.py b/ceilometer/cmd/eventlet/alarm.py
deleted file mode 100644
index b3df8b00..00000000
--- a/ceilometer/cmd/eventlet/alarm.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright 2014 OpenStack Foundation
-#
-# 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.
-
-from oslo_config import cfg
-from oslo_service import service as os_service
-
-from ceilometer.alarm import service as alarm_service
-from ceilometer import service
-
-CONF = cfg.CONF
-
-
-def notifier():
-    service.prepare_service()
-    os_service.launch(CONF, alarm_service.AlarmNotifierService()).wait()
-
-
-def evaluator():
-    service.prepare_service()
-    os_service.launch(CONF, alarm_service.AlarmEvaluationService()).wait()
diff --git a/ceilometer/cmd/eventlet/storage.py b/ceilometer/cmd/eventlet/storage.py
index a38e39d9..752ea63f 100644
--- a/ceilometer/cmd/eventlet/storage.py
+++ b/ceilometer/cmd/eventlet/storage.py
@@ -29,7 +29,6 @@ LOG = logging.getLogger(__name__)
 def dbsync():
     service.prepare_service()
     storage.get_connection_from_config(cfg.CONF, 'metering').upgrade()
-    storage.get_connection_from_config(cfg.CONF, 'alarm').upgrade()
     storage.get_connection_from_config(cfg.CONF, 'event').upgrade()
 
 
@@ -53,12 +52,3 @@ def expirer():
     else:
         LOG.info(_LI("Nothing to clean, database event time to live "
                      "is disabled"))
-
-    if cfg.CONF.database.alarm_history_time_to_live > 0:
-        LOG.debug("Clearing expired alarm history data")
-        storage_conn = storage.get_connection_from_config(cfg.CONF, 'alarm')
-        storage_conn.clear_expired_alarm_history_data(
-            cfg.CONF.database.alarm_history_time_to_live)
-    else:
-        LOG.info(_LI("Nothing to clean, database alarm history time to live "
-                     "is disabled"))