Skip to content

Commit fc6d635

Browse files
authored
RHINENG-13972 pcp generator server setup (#506)
* RHINENG-13972 pcp generator server setup * keep other clowdapp dependencies intact to keep IQE tests running
1 parent 28785f5 commit fc6d635

File tree

4 files changed

+48
-89
lines changed

4 files changed

+48
-89
lines changed

clowdapp.yaml

Lines changed: 21 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,23 @@ objects:
231231
optional: true
232232
- name: BYPASS_UNLEASH
233233
value: ${BYPASS_UNLEASH}
234-
234+
235+
- name: pcp-generator
236+
replicas: ${{PCP_GENERATOR_REPLICA_COUNT}}
237+
podSpec:
238+
image: ${IMAGE}:${IMAGE_TAG}
239+
command: ["bash"]
240+
args: ["-c", "python -m ros.processor.pcp_generator"]
241+
resources:
242+
requests:
243+
cpu: ${CPU_REQUEST_ROSRHEL}
244+
memory: ${MEMORY_REQUEST_ROSRHEL}
245+
limits:
246+
cpu: ${CPU_LIMIT_ROSRHEL}
247+
memory: ${MEMORY_LIMIT_ROSRHEL}
248+
env:
249+
- name: CLOWDER_ENABLED
250+
value: ${CLOWDER_ENABLED}
235251
database:
236252
name: ros
237253
version: 13
@@ -246,40 +262,6 @@ objects:
246262
testing:
247263
iqePlugin: ros
248264

249-
jobs:
250-
- name: org-id-populator
251-
podSpec:
252-
image: quay.io/cloudservices/tenant-utils:latest
253-
command:
254-
- ./org-id-column-populator
255-
- -C
256-
- -a
257-
- account
258-
- -o
259-
- org_id
260-
- -t
261-
- rh_accounts
262-
- --ean-translator-addr
263-
- http://${TENANT_TRANSLATOR_HOST}:${TENANT_TRANSLATOR_PORT}
264-
- --prometheus-push-addr
265-
- ${PROMETHEUS_PUSHGATEWAY}
266-
env:
267-
- name: TENANT_TRANSLATOR_HOST
268-
value: ${TENANT_TRANSLATOR_HOST}
269-
- name: TENANT_TRANSLATOR_PORT
270-
value: ${TENANT_TRANSLATOR_PORT}
271-
- name: LOG_FORMAT
272-
value: ${POPULATOR_LOG_FORMAT}
273-
- name: LOG_BATCH_FREQUENCY
274-
value: '1s'
275-
resources:
276-
limits:
277-
cpu: 300m
278-
memory: 1Gi
279-
requests:
280-
cpu: 50m
281-
memory: 512Mi
282-
283265
parameters:
284266
- description: Enable rbac needs to be "True" or "False"
285267
name: ENABLE_RBAC
@@ -299,10 +281,13 @@ parameters:
299281
- description: Replica count for garbage collector pod
300282
name: GARBAGE_COLLECTOR_REPLICA_COUNT
301283
value: "1"
284+
- description: Replica count for pcp generator
285+
name: PCP_GENERATOR_REPLICA_COUNT
286+
value: "1"
302287
- description: Image NAME
303288
name: IMAGE
304289
required: true
305-
value: quay.io/redhat-services-prod/insights-management-tenant/insights-resource-optimization/ros-backend
290+
value: quay.io/repository/cloudservices/ros-backend
306291
- description: Image tag
307292
name: IMAGE_TAG
308293
required: true

ros/lib/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ def build_endpoint_url(ep):
141141
DAYS_UNTIL_STALE = int(os.getenv("DAYS_UNTIL_STALE", '45'))
142142
CW_LOGGING_FORMAT = '%(asctime)s - %(levelname)s - %(funcName)s - %(message)s'
143143
ROS_PROCESSOR_PORT = int(os.getenv("ROS_PROCESSOR_PORT", "8000"))
144+
ROS_PCP_PROCESSOR_PORT = int(os.getenv("ROS_PCP_PROCESSOR_PORT", "8000"))
144145
ROS_API_PORT = int(os.getenv("ROS_API_PORT", "8000"))
145146
# Timeout in seconds to set against keys of deleted systems in a cache
146147
CACHE_TIMEOUT_FOR_DELETED_SYSTEM = int(

ros/processor/main.py

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

ros/processor/pcp_generator.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import time
2+
from ros.lib.config import get_logger
3+
from prometheus_client import start_http_server
4+
from ros.lib.config import ROS_PCP_PROCESSOR_PORT
5+
6+
7+
logging = get_logger(__name__)
8+
9+
10+
class PCPGenerator:
11+
def __init__(self):
12+
pass
13+
14+
def run(self):
15+
try:
16+
logging.info("Flask server running on port %s", ROS_PCP_PROCESSOR_PORT)
17+
while True:
18+
time.sleep(1)
19+
except Exception as err:
20+
logging.error(err)
21+
22+
23+
if __name__ == "__main__":
24+
start_http_server(ROS_PCP_PROCESSOR_PORT)
25+
processor = PCPGenerator()
26+
processor.run()

0 commit comments

Comments
 (0)