Fix missing variables on stream (#8011)
* stream_container: Bring the missing container variables to stream * stream_container: Missing variables This commit brings 4 new variables that were missed to stream
thiagoftsm committed
Feb 10, 2020 at 11:18 UTC
de4c15cce300757202f4c69eb4f50f4b48491c0b
1 file changed
+63
-43
streaming/rrdpush.c
+63
-43
@@ -567,49 +567,69 @@ static int rrdpush_sender_thread_connect_to_master(RRDHOST *host, int default_po
567
char http[HTTP_HEADER_SIZE + 1];
568
int eol = snprintfz(http, HTTP_HEADER_SIZE,
569
"STREAM key=%s&hostname=%s®istry_hostname=%s&machine_guid=%s&update_every=%d&os=%s&timezone=%s&tags=%s&ver=%u"
570
- "&NETDATA_SYSTEM_OS_NAME=%s"
571
- "&NETDATA_SYSTEM_OS_ID=%s"
572
- "&NETDATA_SYSTEM_OS_ID_LIKE=%s"
573
- "&NETDATA_SYSTEM_OS_VERSION=%s"
574
- "&NETDATA_SYSTEM_OS_VERSION_ID=%s"
575
- "&NETDATA_SYSTEM_OS_DETECTION=%s"
576
- "&NETDATA_SYSTEM_KERNEL_NAME=%s"
577
- "&NETDATA_SYSTEM_KERNEL_VERSION=%s"
578
- "&NETDATA_SYSTEM_ARCHITECTURE=%s"
579
- "&NETDATA_SYSTEM_VIRTUALIZATION=%s"
580
- "&NETDATA_SYSTEM_VIRT_DETECTION=%s"
581
- "&NETDATA_SYSTEM_CONTAINER=%s"
582
- "&NETDATA_SYSTEM_CONTAINER_DETECTION=%s"
583
- "&NETDATA_PROTOCOL_VERSION=%s"
584
- " HTTP/1.1\r\n"
585
- "User-Agent: %s/%s\r\n"
586
- "Accept: */*\r\n\r\n"
587
- , host->rrdpush_send_api_key
588
- , host->hostname
589
- , host->registry_hostname
590
- , host->machine_guid
591
- , default_rrd_update_every
592
- , host->os
593
- , host->timezone
594
- , (host->tags) ? host->tags : ""
595
- , STREAMING_PROTOCOL_CURRENT_VERSION
596
- , (host->system_info->host_os_name) ? host->system_info->host_os_name : ""
597
- , (host->system_info->host_os_id) ? host->system_info->host_os_id : ""
598
- , (host->system_info->host_os_id_like) ? host->system_info->host_os_id_like : ""
599
- , (host->system_info->host_os_version) ? host->system_info->host_os_version : ""
600
- , (host->system_info->host_os_version_id) ? host->system_info->host_os_version_id : ""
601
- , (host->system_info->host_os_detection) ? host->system_info->host_os_detection : ""
602
- , (host->system_info->kernel_name) ? host->system_info->kernel_name : ""
603
- , (host->system_info->kernel_version) ? host->system_info->kernel_version : ""
604
- , (host->system_info->architecture) ? host->system_info->architecture : ""
605
- , (host->system_info->virtualization) ? host->system_info->virtualization : ""
606
- , (host->system_info->virt_detection) ? host->system_info->virt_detection : ""
607
- , (host->system_info->container) ? host->system_info->container : ""
608
- , (host->system_info->container_detection) ? host->system_info->container_detection : ""
609
- , STREAMING_PROTOCOL_VERSION
610
- , host->program_name
611
- , host->program_version
612
- );
570
+ "&NETDATA_SYSTEM_OS_NAME=%s"
571
+ "&NETDATA_SYSTEM_OS_ID=%s"
572
+ "&NETDATA_SYSTEM_OS_ID_LIKE=%s"
573
+ "&NETDATA_SYSTEM_OS_VERSION=%s"
574
+ "&NETDATA_SYSTEM_OS_VERSION_ID=%s"
575
+ "&NETDATA_SYSTEM_OS_DETECTION=%s"
576
+ "&NETDATA_SYSTEM_KERNEL_NAME=%s"
577
+ "&NETDATA_SYSTEM_KERNEL_VERSION=%s"
578
+ "&NETDATA_SYSTEM_ARCHITECTURE=%s"
579
+ "&NETDATA_SYSTEM_VIRTUALIZATION=%s"
580
+ "&NETDATA_SYSTEM_VIRT_DETECTION=%s"
581
+ "&NETDATA_SYSTEM_CONTAINER=%s"
582
+ "&NETDATA_SYSTEM_CONTAINER_DETECTION=%s"
583
+ "&NETDATA_CONTAINER_OS_NAME=%s"
584
+ "&NETDATA_CONTAINER_OS_ID=%s"
585
+ "&NETDATA_CONTAINER_OS_ID_LIKE=%s"
586
+ "&NETDATA_CONTAINER_OS_VERSION=%s"
587
+ "&NETDATA_CONTAINER_OS_VERSION_ID=%s"
588
+ "&NETDATA_CONTAINER_OS_DETECTION=%s"
589
+ "&NETDATA_SYSTEM_CPU_LOGICAL_CPU_COUNT=%s"
590
+ "&NETDATA_SYSTEM_CPU_FREQ=%s"
591
+ "&NETDATA_SYSTEM_TOTAL_RAM=%s"
592
+ "&NETDATA_SYSTEM_TOTAL_DISK_SIZE=%s"
593
+ "&NETDATA_PROTOCOL_VERSION=%s"
594
+ " HTTP/1.1\r\n"
595
+ "User-Agent: %s/%s\r\n"
596
+ "Accept: */*\r\n\r\n"
597
+ , host->rrdpush_send_api_key
598
+ , host->hostname
599
+ , host->registry_hostname
600
+ , host->machine_guid
601
+ , default_rrd_update_every
602
+ , host->os
603
+ , host->timezone
604
+ , (host->tags) ? host->tags : ""
605
+ , STREAMING_PROTOCOL_CURRENT_VERSION
606
+ , (host->system_info->host_os_name) ? host->system_info->host_os_name : ""
607
+ , (host->system_info->host_os_id) ? host->system_info->host_os_id : ""
608
+ , (host->system_info->host_os_id_like) ? host->system_info->host_os_id_like : ""
609
+ , (host->system_info->host_os_version) ? host->system_info->host_os_version : ""
610
+ , (host->system_info->host_os_version_id) ? host->system_info->host_os_version_id : ""
611
+ , (host->system_info->host_os_detection) ? host->system_info->host_os_detection : ""
612
+ , (host->system_info->kernel_name) ? host->system_info->kernel_name : ""
613
+ , (host->system_info->kernel_version) ? host->system_info->kernel_version : ""
614
+ , (host->system_info->architecture) ? host->system_info->architecture : ""
615
+ , (host->system_info->virtualization) ? host->system_info->virtualization : ""
616
+ , (host->system_info->virt_detection) ? host->system_info->virt_detection : ""
617
+ , (host->system_info->container) ? host->system_info->container : ""
618
+ , (host->system_info->container_detection) ? host->system_info->container_detection : ""
619
+ , (host->system_info->container_os_name) ? host->system_info->container_os_name : ""
620
+ , (host->system_info->container_os_id) ? host->system_info->container_os_id : ""
621
+ , (host->system_info->container_os_id_like) ? host->system_info->container_os_id_like : ""
622
+ , (host->system_info->container_os_version) ? host->system_info->container_os_version : ""
623
+ , (host->system_info->container_os_version_id) ? host->system_info->container_os_version_id : ""
624
+ , (host->system_info->container_os_detection) ? host->system_info->container_os_detection : ""
625
+ , (host->system_info->host_cores) ? host->system_info->host_cores : ""
626
+ , (host->system_info->host_cpu_freq) ? host->system_info->host_cpu_freq : ""
627
+ , (host->system_info->host_ram_total) ? host->system_info->host_ram_total : ""
628
+ , (host->system_info->host_disk_space) ? host->system_info->host_disk_space : ""
629
+ , STREAMING_PROTOCOL_VERSION
630
+ , host->program_name
631
+ , host->program_version
632
+ );
633
http[eol] = 0x00;
634
635
#ifdef ENABLE_HTTPS