diff options
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/sections/installation_oom.rst | 9 | ||||
| -rw-r--r-- | docs/sections/services/heartbeat-ms/testprocedure.rst | 8 | ||||
| -rw-r--r-- | docs/sections/services/pm-subscription-handler/configuration.rst | 4 | ||||
| -rw-r--r-- | docs/sections/services/pm-subscription-handler/logging.rst | 23 | ||||
| -rw-r--r-- | docs/sections/services/restconf/index.rst | 4 | ||||
| -rw-r--r-- | docs/sections/services/serviceindex.rst | 3 | ||||
| -rw-r--r-- | docs/sections/services/snmptrap/installation.rst | 4 | ||||
| -rwxr-xr-x | mvn-phase-lib.sh | 8 | ||||
| -rwxr-xr-x | mvn-phase-script.sh | 4 |
10 files changed, 43 insertions, 26 deletions
diff --git a/docs/conf.py b/docs/conf.py index 8f40e8b8..5371015c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,4 +12,4 @@ intersphinx_mapping = {} html_last_updated_fmt = '%d-%b-%y %H:%M' def setup(app): - app.add_stylesheet("css/ribbon_onap.css") + app.add_stylesheet("css/ribbon.css") diff --git a/docs/sections/installation_oom.rst b/docs/sections/installation_oom.rst index 1af68aa3..2cb1bb02 100644 --- a/docs/sections/installation_oom.rst +++ b/docs/sections/installation_oom.rst @@ -25,13 +25,14 @@ DCAE charts are placed under the **dcaegen2** directory. All DCAE platform components have corresponding Helm chart which will be used to trigger the deployment. All DCAE Services are deployed through Cloudify Blueprint. The default ONAP DCAE deployment includes small subset of DCAE services deployed through Bootstrap pod to meet -ONAP Integration usecases. Optionally operators can deploy on-demand other MS required for their usecases as described in `On-demand MS Installation -<installation_MS_ondemand>`_. +ONAP Integration usecases. Optionally operators can deploy on-demand other MS required for their usecases as described in :doc:`On-demand MS Installation +<./installation_MS_ondemand>`. + The PNDA data platform is an optional DCAE component that is placed under the **pnda** directory. Details for how to configure values to enable PNDA installation during Helm install -are described in `Installing PNDA through Helm Chart -<installation_pnda>`_. +are described in :doc:`Installing PNDA through Helm Chart +<./installation_pnda>`. DCAE Chart Organization diff --git a/docs/sections/services/heartbeat-ms/testprocedure.rst b/docs/sections/services/heartbeat-ms/testprocedure.rst index 03bcbab1..a7c6f799 100644 --- a/docs/sections/services/heartbeat-ms/testprocedure.rst +++ b/docs/sections/services/heartbeat-ms/testprocedure.rst @@ -203,7 +203,7 @@ The postgres DB also have a CL_flag set indicating control loop event with ONSET ubuntu@r3-aai-inst2:~/heartbeat12Dec/heartbeat$ sudo Docker run -d --name hb1 --env-file env.list heartbeat.test1:latest102413e8af4ab754e008cee43a01bf3d5439820aa91cfb4e099a140a7931fd71
ubuntu@r3-aai-inst2:~/heartbeat12Dec/heartbeat$ sudo Docker logs -f hb1
- /usr/local/lib/python3.6/site-packages/psycopg2/__init__.py:144: UserWarning: The psycopg2 wheel package will be renamed from release 2.8; in order to keep installing from binary please use "pip install psycopg2-binary" instead. For details see: <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>.
+ /usr/local/lib/python3.6/site-packages/psycopg2/__init__.py:144: UserWarning: The psycopg2 wheel package will be renamed from release 2.8; in order to keep installing from binary please use "pip install --no-cache-dir psycopg2-binary" instead. For details see: <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>.
""")
2018-12-12 12:39:58,968 | __main__ | misshtbtd | main | 309 | INFO | MSHBD:Execution Started
2018-12-12 12:39:58,970 | __main__ | misshtbtd | main | 314 | INFO | ('MSHBT:HB Properties -', '10.0.4.1', '5432', 'postgres', 'abc', 'hb_vnf', True, 300)
@@ -235,16 +235,16 @@ The postgres DB also have a CL_flag set indicating control loop event with ONSET 2018-12-12 12:39:59,139 | __main__ | misshtbtd | main | 386 | INFO | ('MSHBD: Creating HB and DBM threads. The param pssed %d and %s', '../etc/config.json', 7)
2018-12-12 12:39:59,142 | __main__ | misshtbtd | create_process | 301 | INFO | ('MSHBD:jobs list is', [<Process(Process-2, started)>, <Process(Process-3, started)>])
2018-12-12 12:39:59,221 | __main__ | misshtbtd | create_update_hb_common | 143 | INFO | MSHBT:Updated hb_common DB with new values
- /usr/local/lib/python3.6/site-packages/psycopg2/__init__.py:144: UserWarning: The psycopg2 wheel package will be renamed from release 2.8; in order to keep installing from binary please use "pip install psycopg2-binary" instead. For details see: <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>.
+ /usr/local/lib/python3.6/site-packages/psycopg2/__init__.py:144: UserWarning: The psycopg2 wheel package will be renamed from release 2.8; in order to keep installing from binary please use "pip install --no-cache-dir psycopg2-binary" instead. For details see: <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>.
""")
2018-12-12 12:39:59,815 | __main__ | htbtworker | <module> | 243 | INFO | HBT:HeartBeat thread Created
2018-12-12 12:39:59,815 | __main__ | htbtworker | <module> | 245 | INFO | ('HBT:The config file name passed is -%s', '../etc/config.json')
- /usr/local/lib/python3.6/site-packages/psycopg2/__init__.py:144: UserWarning: The psycopg2 wheel package will be renamed from release 2.8; in order to keep installing from binary please use "pip install psycopg2-binary" instead. For details see: <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>.
+ /usr/local/lib/python3.6/site-packages/psycopg2/__init__.py:144: UserWarning: The psycopg2 wheel package will be renamed from release 2.8; in order to keep installing from binary please use "pip install --no-cache-dir psycopg2-binary" instead. For details see: <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>.
""")
2018-12-12 12:39:59,931 | __main__ | cbs_polling | pollCBS | 39 | INFO | ('CBSP:Main process ID in hb_common is %d', 7)
2018-12-12 12:39:59,931 | __main__ | cbs_polling | pollCBS | 41 | INFO | ('CBSP:My parent process ID is %d', '7')
2018-12-12 12:39:59,931 | __main__ | cbs_polling | pollCBS | 43 | INFO | ('CBSP:CBS Polling interval is %d', 300)
- /usr/local/lib/python3.6/site-packages/psycopg2/__init__.py:144: UserWarning: The psycopg2 wheel package will be renamed from release 2.8; in order to keep installing from binary please use "pip install psycopg2-binary" instead. For details see: <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>.
+ /usr/local/lib/python3.6/site-packages/psycopg2/__init__.py:144: UserWarning: The psycopg2 wheel package will be renamed from release 2.8; in order to keep installing from binary please use "pip install --no-cache-dir psycopg2-binary" instead. For details see: <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>.
""")
2018-12-12 12:39:59,937 | __main__ | db_monitoring | <module> | 231 | INFO | DBM: DBM Process started
2018-12-12 12:39:59,939 | __main__ | db_monitoring | <module> | 236 | INFO | ('DBM:Parent process ID and json file name', '7', '../etc/config.json')
diff --git a/docs/sections/services/pm-subscription-handler/configuration.rst b/docs/sections/services/pm-subscription-handler/configuration.rst index 8f02af0e..83d9cfd8 100644 --- a/docs/sections/services/pm-subscription-handler/configuration.rst +++ b/docs/sections/services/pm-subscription-handler/configuration.rst @@ -47,6 +47,10 @@ specified in the dashboard deployment GUI. +-----------------------------+----------------------------------------------------------------------------------------+---------+----------+-------------------------------------------------------------------------------------+ | pgaas_cluster_name | Cluster name for Postgres As A Service. | string | True | dcae-pg-primary.onap | +-----------------------------+----------------------------------------------------------------------------------------+---------+----------+-------------------------------------------------------------------------------------+ +| enable_tls | Boolean flag to toggle HTTPS cert auth support. | boolean | True | true | ++-----------------------------+----------------------------------------------------------------------------------------+---------+----------+-------------------------------------------------------------------------------------+ +| protocol | HTTP protocol for PMSH. If 'enable_tls' is false, protocol must be set to http. | string | True | https | ++-----------------------------+----------------------------------------------------------------------------------------+---------+----------+-------------------------------------------------------------------------------------+ .. _Subscription: diff --git a/docs/sections/services/pm-subscription-handler/logging.rst b/docs/sections/services/pm-subscription-handler/logging.rst index 59518d91..f24fdf0a 100644 --- a/docs/sections/services/pm-subscription-handler/logging.rst +++ b/docs/sections/services/pm-subscription-handler/logging.rst @@ -3,14 +3,29 @@ .. _Logging: -The PMSH logs will roll when the log file reaches 10Mb and a single backup will be kept. The logging level is not -configurable. +The PMSH logs will be rotated when the log file reaches 10Mb and a single backup will be kept, +with a maximum of 10 back ups. Logging ======= -The PMSH application writes logs on the debug level to the following file: +The PMSH application writes logs at INFO level to STDOUT, and also to the following file: .. code-block:: bash - /var/log/ONAP/dcaegen2/services/pmsh/debug.log + /var/log/ONAP/dcaegen2/services/pmsh/application.log + +To configure PMSH log level, the configuration yaml needs to be altered: + +.. code-block:: bash + + vi /opt/app/pmsh/log_config.yaml + +onap_logger level should be changed from INFO to DEBUG in order to enable debug logs to be +captured. This will affect both STDOUT logs and the logs written to application.log file + +.. code-block:: yaml + + loggers: + onap_logger: + level: INFO
\ No newline at end of file diff --git a/docs/sections/services/restconf/index.rst b/docs/sections/services/restconf/index.rst index 4b81b211..66564e90 100644 --- a/docs/sections/services/restconf/index.rst +++ b/docs/sections/services/restconf/index.rst @@ -5,10 +5,6 @@ RestConf Collector ================== -.. contents:: - :depth: 3 -.. - Overview ======== diff --git a/docs/sections/services/serviceindex.rst b/docs/sections/services/serviceindex.rst index aa29f06e..83b92bbc 100644 --- a/docs/sections/services/serviceindex.rst +++ b/docs/sections/services/serviceindex.rst @@ -23,4 +23,5 @@ DCAE Service components ./son-handler/index.rst ./restconf/index.rst ./tca-cdap/index.rst - ./tcagen2-docker/index.rst
\ No newline at end of file + ./tcagen2-docker/index.rst + ./datalake-handler/index.rst
\ No newline at end of file diff --git a/docs/sections/services/snmptrap/installation.rst b/docs/sections/services/snmptrap/installation.rst index 23d28d65..cce201d3 100644 --- a/docs/sections/services/snmptrap/installation.rst +++ b/docs/sections/services/snmptrap/installation.rst @@ -61,9 +61,9 @@ To install prerequisites: ``export PATH=<path to Python 3.6 binary>:$PATH`` - ``pip3 install requests==2.18.3`` + ``pip3 install --no-cache-dir requests==2.18.3`` - ``pip3 install pysnmp==4.4.5`` + ``pip3 install --no-cache-dir pysnmp==4.4.5`` Download latest trapd version from Gerrit """"""""""""""""""""""""""""""""""""""""" diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh index 66d5bbc0..4f0c304c 100755 --- a/mvn-phase-lib.sh +++ b/mvn-phase-lib.sh @@ -176,8 +176,8 @@ run_tox_test() rm -rf ./venv-tox ./.tox virtualenv ./venv-tox source ./venv-tox/bin/activate - pip install --upgrade pip - pip install --upgrade tox argparse + pip install --no-cache-dir --upgrade pip + pip install --no-cache-dir --upgrade tox argparse pip freeze tox deactivate @@ -199,8 +199,8 @@ build_wagons() virtualenv ./venv-pkg source ./venv-pkg/bin/activate - pip install --upgrade pip - pip install wagon + pip install --no-cache-dir --upgrade pip + pip install --no-cache-dir wagon wagon create --format tar.gz "$PLUGIN_DIR" deactivate rm -rf venv-pkg diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index 6bc987f6..ebb609f0 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -75,8 +75,8 @@ deploy) CURDIR=$(pwd) virtualenv ./venv-doc source ./venv-doc/bin/activate - pip install --upgrade pip - pip install --upgrade 'mkdocs==0.16.3' mkdocs-material + pip install --no-cache-dir --upgrade pip + pip install --no-cache-dir --upgrade 'mkdocs==0.16.3' mkdocs-material pip freeze mkdocs build |