Skip to content

Synchronise master with upstream #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 11, 2025
Merged

Synchronise master with upstream #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b72394
Improve devstack plugin configuration
paramite Apr 11, 2025
f87d3e4
Replace deprecated datetime.datetime.utcnow
kajinamit May 30, 2025
ca4aa4a
Merge "Replace deprecated datetime.datetime.utcnow"
Jun 2, 2025
44345dc
Merge "Improve devstack plugin configuration"
Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cloudkitty/tests/test_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
#
import datetime
from oslo_utils import timeutils

from cloudkitty import state
from cloudkitty import tests
Expand All @@ -29,14 +29,14 @@ def test_gen_name(self):
self.assertEqual(name, 'testuser_osrtf')

def test_state_access(self):
now = datetime.datetime.utcnow()
now = timeutils.utcnow()
self.sm.set_state(now)
result = self.sm.get_state()
self.assertEqual(result, str(now))

def test_metadata_access(self):
metadata = {'foo': 'bar'}
now = datetime.datetime.utcnow()
now = timeutils.utcnow()
self.sm.set_state(now)
self.sm.set_metadata(metadata)
result = self.sm.get_metadata()
Expand Down
4 changes: 3 additions & 1 deletion contrib/ci/csv_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import sys
import uuid

from oslo_utils import timeutils

from cloudkitty import json_utils as json


Expand Down Expand Up @@ -588,7 +590,7 @@ def main():
generators = [compute, image, volume, net_bw, floating]

# Date
now = datetime.datetime.utcnow()
now = timeutils.utcnow()
hour_delta = datetime.timedelta(hours=1)
cur_date = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
cur_month = cur_date.month
Expand Down
11 changes: 9 additions & 2 deletions devstack/plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function configure_cloudkitty {
iniset $CLOUDKITTY_CONF oslo_policy policy_file 'policy.yaml'

cp $CLOUDKITTY_DIR$CLOUDKITTY_CONF_DIR/api_paste.ini $CLOUDKITTY_CONF_DIR
cp $CLOUDKITTY_DIR$CLOUDKITTY_CONF_DIR/metrics.yml $CLOUDKITTY_CONF_DIR
cp $CLOUDKITTY_METRICS_CONF $CLOUDKITTY_CONF_DIR
iniset_rpc_backend cloudkitty $CLOUDKITTY_CONF DEFAULT

iniset $CLOUDKITTY_CONF DEFAULT notification_topics 'notifications'
Expand All @@ -135,6 +135,10 @@ function configure_cloudkitty {
iniset $CLOUDKITTY_CONF "fetcher_$CLOUDKITTY_FETCHER" auth_section authinfos
if [[ "$CLOUDKITTY_FETCHER" == "keystone" ]]; then
iniset $CLOUDKITTY_CONF fetcher_keystone keystone_version 3
elif [ $CLOUDKITTY_FETCHER == 'prometheus' ]; then
iniset $CLOUDKITTY_CONF "fetcher_prometheus" prometheus_url $CLOUDKITTY_PROMETHEUS_URL
iniset $CLOUDKITTY_CONF "fetcher_prometheus" metric $CLOUDKITTY_FETCHER_METRIC
iniset $CLOUDKITTY_CONF "fetcher_prometheus" scope_attribute $CLOUDKITTY_FETCHER_SCOPE_ATTRIBUTE
fi

if [ "$CLOUDKITTY_STORAGE_BACKEND" == "influxdb" ] && [ "$CLOUDKITTY_INFLUX_VERSION" == 1 ]; then
Expand Down Expand Up @@ -166,7 +170,10 @@ function configure_cloudkitty {
# collect
iniset $CLOUDKITTY_CONF collect collector $CLOUDKITTY_COLLECTOR
iniset $CLOUDKITTY_CONF "collector_${CLOUDKITTY_COLLECTOR}" auth_section authinfos
iniset $CLOUDKITTY_CONF collect metrics_conf $CLOUDKITTY_CONF_DIR/$CLOUDKITTY_METRICS_CONF
if [ $CLOUDKITTY_COLLECTOR == 'prometheus' ]; then
iniset $CLOUDKITTY_CONF collector_prometheus prometheus_url $CLOUDKITTY_PROMETHEUS_URL
fi
iniset $CLOUDKITTY_CONF collect metrics_conf $CLOUDKITTY_CONF_DIR/$(basename $CLOUDKITTY_METRICS_CONF)
# DO NOT DO THIS IN PRODUCTION! This is done in order to get data quicker
# when starting a devstack installation, but is NOT a recommended setting
iniset $CLOUDKITTY_CONF collect wait_periods 0
Expand Down
6 changes: 5 additions & 1 deletion devstack/settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,14 @@ CLOUDKITTY_PRICING_TENANT=${CLOUDKITTY_PRICING_TENANT:-"demo"}

# Set CloudKitty fetcher info
CLOUDKITTY_FETCHER=${CLOUDKITTY_FETCHER:-gnocchi}
# Prometheus fetcher related setting
CLOUDKITTY_FETCHER_METRIC=${CLOUDKITTY_FETCHER_METRIC:-openstack_identity_projects_info}
CLOUDKITTY_FETCHER_SCOPE_ATTRIBUTE=${CLOUDKITTY_FETCHER_SCOPE_ATTRIBUTE:-id}

# Set CloudKitty collect info
CLOUDKITTY_COLLECTOR=${CLOUDKITTY_COLLECTOR:-gnocchi}
CLOUDKITTY_METRICS_CONF=metrics.yml
CLOUDKITTY_METRICS_CONF=${CLOUDKITTY_METRICS_CONF:-$CLOUDKITTY_DIR$CLOUDKITTY_CONF_DIR/metrics.yml}
CLOUDKITTY_PROMETHEUS_URL=${CLOUDKITTY_PROMETHEUS_URL:-http://localhost:9090/api/v1}

# Set CloudKitty storage info
CLOUDKITTY_STORAGE_BACKEND=${CLOUDKITTY_STORAGE_BACKEND:-"influxdb"}
Expand Down