Skip to content

Commit 6a46bea

Browse files
Change the default package name.
1 parent 3d86911 commit 6a46bea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+222
-228
lines changed

README.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
# The LogicMonitor Python Ingestion library
1+
# The LogicMonitor Python Data library
22
This Python Library is suitable for ingesting the metrics into the LogicMonitor Platform
33

4-
[![Build](https://circleci.com/gh/mukundneharkar/lmsdk.svg?style=svg)](https://circleci.com/gh/mukundneharkar/lmsdk.svg?style=svg)
5-
[![Documentation Status](https://readthedocs.org/projects/logicmonitor-api-sdk-py/badge/?version=latest)](https://logicmonitor-api-sdk-py.readthedocs.io/en/latest/?badge=latest)
6-
[![PyPI - Version](https://img.shields.io/pypi/v/logicmonitor-api-sdk-py.svg)](https://pypi.org/project/logicmonitor-api-sdk-py)
7-
[![PyPI - Downloads](https://pepy.tech/badge/logicmonitor-api-sdk-py)](https://pepy.tech/project/logicmonitor-api-sdk-py)
4+
[![Documentation Status](https://readthedocs.org/projects/logicmonitor-data-sdk-py/badge/?version=latest)](https://logicmonitor-data-sdk-py.readthedocs.io/en/latest/?badge=latest)
5+
[![PyPI - Version](https://img.shields.io/pypi/v/logicmonitor-data-sdk-py.svg)](https://pypi.org/project/logicmonitor-data-sdk-py)
6+
[![PyPI - Downloads](https://pepy.tech/badge/logicmonitor-data-sdk-py)](https://pepy.tech/project/logicmonitor-data-sdk-py)
87

98

10-
- Library Documentation: https://logicmonitor-api-sdk-py.readthedocs.io/en/latest/
9+
- Library Documentation: https://logicmonitor-data-sdk-py.readthedocs.io/en/latest/
1110
- LogicMonitor: https://LogicMonitor.com
1211

1312
Overview
@@ -27,7 +26,7 @@ Python 2.7 and 3.4+
2726

2827
Documentation
2928
-------------
30-
https://logicmonitor-api-sdk-py.readthedocs.io/en/latest/
29+
https://logicmonitor-data-sdk-py.readthedocs.io/en/latest/
3130

3231

3332
Getting Started
@@ -45,17 +44,17 @@ interval.
4544

4645
import psutil as psutil
4746

48-
import logicmonitor_api_sdk
49-
from logicmonitor_api_sdk.api.response_interface import ResonseInterface
50-
from logicmonitor_api_sdk.models import Resource, DataSource, DataPoint, \
47+
import logicmonitor_data_sdk
48+
from logicmonitor_data_sdk.api.response_interface import ResonseInterface
49+
from logicmonitor_data_sdk.models import Resource, DataSource, DataPoint, \
5150
DataSourceInstance
5251

53-
from logicmonitor_api_sdk.api.metrics import Metrics
52+
from logicmonitor_data_sdk.api.metrics import Metrics
5453

55-
logger = logging.getLogger('lmingest.api')
54+
logger = logging.getLogger('lmdata.api')
5655
logger.setLevel(logging.INFO)
5756

58-
configuration = logicmonitor_api_sdk.Configuration()
57+
configuration = logicmonitor_data_sdk.Configuration()
5958
# For debug log, set the value to True
6059
configuration.debug = True
6160

@@ -81,7 +80,7 @@ interval.
8180
create=True)
8281
datasource = DataSource(name="DiskUsingSDK")
8382
datapoints = ['total', 'used', 'free']
84-
metric_api = Metrics(batch=True, interval=10, response_callback=MyResponse())
83+
metric_api = Metrics(batch=True, interval=30, response_callback=MyResponse())
8584
while True:
8685
partitions = psutil.disk_partitions()
8786
for p in partitions:
@@ -99,7 +98,7 @@ interval.
9998
instance=instance,
10099
datapoint=datapoint,
101100
values=values)
102-
time.sleep(10)
101+
time.sleep(5)
103102

104103

105104
if __name__ == "__main__":
@@ -118,5 +117,4 @@ Then run the program as:
118117

119118
Get in Touch
120119
------------
121-
122-
If you'd like to suggest a feature or report a bug, please add an issue `here <https://github.com/logicmonitor/logicmonitor_api_sdk_py/issues>`_.
120+
If you have questions in general, reach out to our [support](mailto:support@logicmonitor.com)

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
# -- Project information -----------------------------------------------------
2020
_version = {}
21-
with open("../../logicmonitor_api_sdk/version.py") as fp:
21+
with open("../../logicmonitor_data_sdk/version.py") as fp:
2222
exec(fp.read(), _version)
2323

24-
project = 'LogicMonitor API SDK Python'
24+
project = 'LogicMonitor DATA SDK Python'
2525
copyright = '2021, Logicmonitor'
2626
author = 'Logicmonitor'
2727

docs/source/index.rst

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*****************************************
2-
Python Ingestion library for LogicMonitor
2+
Python Data SDK library for LogicMonitor
33
*****************************************
44

55
This Python Library for ingesting the metrics into the LogicMonitor Platform
@@ -21,6 +21,8 @@ alerting.
2121
More details are available on `support
2222
site <https://www.logicmonitor.com/support>`__
2323

24+
The :mod:`logicmonitor_data_sdk` module provides
25+
- :mod:`logicmonitor_data_sdk.api.metrics`: a HTTP Api client for ingesting the metrics data.
2426

2527
Requirements.
2628
*************
@@ -35,30 +37,26 @@ Installation
3537
pip install
3638
===========
3739

38-
If the python package ishosted on Github, you can install directly from
39-
Github
40+
Install from PyPI.
4041

4142
.. code:: sh
4243
43-
pip install logicmonitor_api_sdk
44+
pip install logicmonitor_data_sdk
4445
45-
| (you may need to run ``pip`` with root permission:
46-
47-
``sudo pip install logicmonitor_api_sdk``)
4846
4947
Then import the package:
5048

5149
.. code:: python
5250
53-
import logicmonitor_api_sdk
51+
import logicmonitor_data_sdk
5452
5553
5654
Getting Started
5755
***************
5856

5957
Please follow the :ref:`RST Installation` and then run below a working example for submitting the disk
6058
metrics to your LM account. This script will monitor the Usage, Free and Total of the disk at
61-
every 10 sec interval.
59+
every 5 sec interval.
6260

6361
.. literalinclude:: ../../example/disk_metrics.py
6462
:language: python
@@ -75,10 +73,10 @@ Then run the program as:
7573

7674
Configuration
7775
*************
78-
SDK must be configured with logicmonitor_api_sdk.Configuration().
76+
SDK must be configured with logicmonitor_data_sdk.Configuration().
7977
The account name, an API key and its id are required.
8078

81-
.. automodule:: logicmonitor_api_sdk.configuration
79+
.. automodule:: logicmonitor_data_sdk.configuration
8280
:members:
8381

8482
API Calls
@@ -94,7 +92,7 @@ Be sure to initialize the client using :ref:`RST Configuration` and then use :re
9492

9593
Metrics Ingestion API
9694
=====================
97-
.. automodule:: logicmonitor_api_sdk.api.metrics
95+
.. automodule:: logicmonitor_data_sdk.api.metrics
9896
:members:
9997

10098

@@ -103,28 +101,28 @@ Models
103101

104102
Resource
105103
==========
106-
.. automodule:: logicmonitor_api_sdk.models.resource
104+
.. automodule:: logicmonitor_data_sdk.models.resource
107105
:members:
108106

109107
DataSource
110108
============
111-
.. automodule:: logicmonitor_api_sdk.models.datasource
109+
.. automodule:: logicmonitor_data_sdk.models.datasource
112110
:members:
113111

114112
DataSourceInstance
115113
====================
116-
.. automodule:: logicmonitor_api_sdk.models.datasource_instance
114+
.. automodule:: logicmonitor_data_sdk.models.datasource_instance
117115
:members:
118116

119117
DataPoint
120118
============
121-
.. automodule:: logicmonitor_api_sdk.models.datapoint
119+
.. automodule:: logicmonitor_data_sdk.models.datapoint
122120
:members:
123121

124122

125123
ResonseInterface
126124
==================
127-
.. automodule:: logicmonitor_api_sdk.api.response_interface
125+
.. automodule:: logicmonitor_data_sdk.api.response_interface
128126
:members:
129127

130128
.. toctree::
@@ -143,5 +141,4 @@ ResonseInterface
143141

144142
Get in Touch
145143
============
146-
147-
If you'd like to suggest a feature or report a bug, please add an issue `here <https://github.com/logicmonitor/logicmonitor_api_sdk_py/issues>`_.
144+
If you have questions in general, reach out to our support@logicmonitor.com

example/cpu_metrics.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
import psutil as psutil
77

88
sys.path.append("..")
9-
import logicmonitor_api_sdk
10-
from logicmonitor_api_sdk.api.response_interface import ResonseInterface
11-
from logicmonitor_api_sdk.models import Resource, DataSource, DataPoint, \
9+
import logicmonitor_data_sdk
10+
from logicmonitor_data_sdk.api.response_interface import ResonseInterface
11+
from logicmonitor_data_sdk.models import Resource, DataSource, DataPoint, \
1212
DataSourceInstance
1313

14-
from logicmonitor_api_sdk.api.metrics import Metrics
14+
from logicmonitor_data_sdk.api.metrics import Metrics
1515

16-
logger = logging.getLogger('lmingest.api')
16+
logger = logging.getLogger('lmdata.api')
1717
logger.setLevel(logging.INFO)
1818

19-
configuration = logicmonitor_api_sdk.Configuration()
19+
configuration = logicmonitor_data_sdk.Configuration()
2020
# For debug log, set the value to True
2121
configuration.debug = False
2222

example/disk_metrics.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
import psutil as psutil
66

7-
import logicmonitor_api_sdk
8-
from logicmonitor_api_sdk.api.metrics import Metrics
9-
from logicmonitor_api_sdk.api.response_interface import ResonseInterface
10-
from logicmonitor_api_sdk.models import Resource, DataSource, DataPoint, \
7+
import logicmonitor_data_sdk
8+
from logicmonitor_data_sdk.api.metrics import Metrics
9+
from logicmonitor_data_sdk.api.response_interface import ResonseInterface
10+
from logicmonitor_data_sdk.models import Resource, DataSource, DataPoint, \
1111
DataSourceInstance
1212

13-
logger = logging.getLogger('lmingest.api')
13+
logger = logging.getLogger('lmdata.api')
1414
logger.setLevel(logging.INFO)
1515

16-
configuration = logicmonitor_api_sdk.Configuration()
16+
configuration = logicmonitor_data_sdk.Configuration()
1717
# For debug log, set the value to True
1818
configuration.debug = False
1919

@@ -39,13 +39,15 @@ def MetricRequest():
3939
create=True)
4040
datasource = DataSource(name="DiskUsingSDK")
4141
datapoints = ['total', 'used', 'free']
42-
metric_api = Metrics(batch=True, interval=10, response_callback=MyResponse())
42+
metric_api = Metrics(batch=True, interval=30, response_callback=MyResponse())
4343
while True:
4444
partitions = psutil.disk_partitions()
4545
for p in partitions:
4646
# Using the device as instance name. We can use the mountpoint as well.
47+
4748
instance_name = p.device
4849
usage = psutil.disk_usage(instance_name)._asdict()
50+
4951
# Create the instance object for every device. Name should not have the
5052
# special characters so replacing it with the '-'.
5153
instance = DataSourceInstance(name=instance_name.replace('/', '-'),
@@ -58,7 +60,7 @@ def MetricRequest():
5860
instance=instance,
5961
datapoint=datapoint,
6062
values=values)
61-
time.sleep(10)
63+
time.sleep(5)
6264

6365

6466
if __name__ == "__main__":

example/test_property.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
import sys
33

44
sys.path.append("..")
5-
import logicmonitor_api_sdk
6-
from logicmonitor_api_sdk.api.metrics import Metrics
5+
import logicmonitor_data_sdk
6+
from logicmonitor_data_sdk.api.metrics import Metrics
77

8-
logger = logging.getLogger('lmingest.api')
8+
logger = logging.getLogger('lmdata.api')
99
logger.setLevel(logging.INFO)
1010

11-
configuration = logicmonitor_api_sdk.Configuration(company='COMPANY',
12-
authentication={
13-
'id': 'ID',
14-
'key': 'KEY'})
11+
configuration = logicmonitor_data_sdk.Configuration(company='COMPANY',
12+
authentication={
13+
'id': 'ID',
14+
'key': 'KEY'})
1515

1616
configuration.debug = False
1717

logicmonitor_api_sdk/__init__.py

Lines changed: 0 additions & 27 deletions
This file was deleted.

logicmonitor_api_sdk/models/__init__.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

logicmonitor_api_sdk/utils/__init__.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

logicmonitor_data_sdk/__init__.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# coding: utf-8
2+
3+
# flake8: noqa
4+
5+
from __future__ import absolute_import
6+
7+
# import apis into sdk package
8+
# import ApiClient
9+
from logicmonitor_data_sdk.api_client import ApiClient
10+
from logicmonitor_data_sdk.configuration import Configuration
11+
# import models into sdk package
12+
from logicmonitor_data_sdk.models.list_rest_data_point_v1 import \
13+
ListRestDataPointV1
14+
from logicmonitor_data_sdk.models.list_rest_data_source_instance_v1 import \
15+
ListRestDataSourceInstanceV1
16+
from logicmonitor_data_sdk.models.map_string_string import MapStringString
17+
from logicmonitor_data_sdk.models.push_metric_api_response import \
18+
PushMetricAPIResponse
19+
from logicmonitor_data_sdk.models.rest_data_point_v1 import RestDataPointV1
20+
from logicmonitor_data_sdk.models.rest_data_source_instance_v1 import \
21+
RestDataSourceInstanceV1
22+
from logicmonitor_data_sdk.models.rest_instance_properties_v1 import \
23+
RestInstancePropertiesV1
24+
from logicmonitor_data_sdk.models.rest_metrics_v1 import RestMetricsV1
25+
from logicmonitor_data_sdk.models.rest_resource_properties_v1 import \
26+
RestResourcePropertiesV1
27+
from logicmonitor_data_sdk.version import __version__

0 commit comments

Comments
 (0)