Commit af72be78 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'staging' into 'main'

Merge Latest changes from staging to main

See merge request !99
parents f4640ce8 d3abf5e2
Loading
Loading
Loading
Loading
Loading
+9 −9
Original line number Original line Diff line number Diff line
@@ -19,15 +19,15 @@ services/easy_rsa/certs/*EasyRSA*
services/easy_rsa/certs/*.profile
services/easy_rsa/certs/*.profile
services/easy_rsa/certs/*.csr
services/easy_rsa/certs/*.csr


monitoring/grafana/grafana_db/*
services/monitoring/grafana/grafana_db/*
!monitoring/grafana/grafana_db/.keep
!services/monitoring/grafana/grafana_db/.keep
monitoring/prometheus/prometheus_db/*
services/monitoring/prometheus/prometheus_db/*
!monitoring/prometheus/prometheus_db/.keep
!services/monitoring/prometheus/prometheus_db/.keep
monitoring/prometheus/alert.rules/*
services/monitoring/prometheus/alert.rules/*
!monitoring/prometheus/alert.rules/.keep
!services/monitoring/prometheus/alert.rules/.keep
monitoring/tempo/tempo-data/*
services/monitoring/tempo/tempo-data/*
!monitoring/tempo/tempo-data/.keep
!services/monitoring/tempo/tempo-data/.keep

services/monitoring/grafana/grafana_db/*


docs/testing_with_postman/*node_modules*
docs/testing_with_postman/*node_modules*
docs/testing_with_postman/Responses
docs/testing_with_postman/Responses
+2 −15
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@
- [Common API Framework (CAPIF)](#common-api-framework-capif)
- [Common API Framework (CAPIF)](#common-api-framework-capif)
- [CAPIF\_API\_Services](#capif_api_services)
- [CAPIF\_API\_Services](#capif_api_services)
- [Documentation](#documentation)
- [Documentation](#documentation)
- [Install and Run](#install-and-run)
  - [How to run CAPIF services in this Repository](#how-to-run-capif-services-in-this-repository)
  - [How to run CAPIF services in this Repository](#how-to-run-capif-services-in-this-repository)
    - [Run All CAPIF Services locally with Docker images](#run-all-capif-services-locally-with-docker-images)
    - [Run All CAPIF Services locally with Docker images](#run-all-capif-services-locally-with-docker-images)
    - [Run All CAPIF Services locally with Docker images and deploy monitoring stack](#run-all-capif-services-locally-with-docker-images-and-deploy-monitoring-stack)
    - [Run All CAPIF Services locally with Docker images and deploy monitoring stack](#run-all-capif-services-locally-with-docker-images-and-deploy-monitoring-stack)
@@ -25,20 +26,6 @@ Please refer to [OCF Documentation] for more detailed information.




# Install and Run 
# Install and Run 
### (to be added in Getting Started section of Documentation)
```
mkdir OpenCAPIF

cd OpenCAPIF

# The link must be changed when finally merged with the default branch and be permanent
wget https://labs.etsi.org/rep/ocf/capif/-/raw/OCF19-local-installation-of-capif-downloading-script/deploy.sh

chmod +x deploy.sh

# ./deploy.sh [branch to fetch] [true or false (default) to install monitoring stack or not]
./deploy.sh staging
```


## How to run CAPIF services in this Repository
## How to run CAPIF services in this Repository
Capif services are developed under /service/ folder.
Capif services are developed under /service/ folder.
@@ -161,11 +148,11 @@ or
http://<Mongo Register Express Host IP>:8083/ (if accessed from another host)
http://<Mongo Register Express Host IP>:8083/ (if accessed from another host)
```
```



# FAQ Documentation
# FAQ Documentation


Frequently asked questions can be found here: [FAQ Directory]
Frequently asked questions can be found here: [FAQ Directory]



[Open API Descriptions of 3GPP 5G APIs]: https://forge.3gpp.org/rep/all/5G_APIs  "Open API Descriptions of 3GPP 5G APIs"
[Open API Descriptions of 3GPP 5G APIs]: https://forge.3gpp.org/rep/all/5G_APIs  "Open API Descriptions of 3GPP 5G APIs"
[Test Plan Directory]: ./docs/test_plan/README.md  "Test Plan Directory"
[Test Plan Directory]: ./docs/test_plan/README.md  "Test Plan Directory"
[Testing Using Curl]: ./docs/testing_with_curl/README.md  "Testing Using Curl"
[Testing Using Curl]: ./docs/testing_with_curl/README.md  "Testing Using Curl"

helm/DELETE.txt

deleted100644 → 0
+0 −1
Original line number Original line Diff line number Diff line
delete me
+42 −294

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Original line number Original line Diff line number Diff line
apiVersion: v2
apiVersion: v2
name: fluentbit
name: fluentbit
description: A Helm chart for Kubernetes
description: A Helm chart for Kubernetes of fluentbit OCF


# A chart can be either an 'application' or a 'library' chart.
# A chart can be either an 'application' or a 'library' chart.
#
#
Loading