[nifi] branch master updated: NIFI-6352: Add ability to report all component metrics to Prometheus
This is an automated email from the ASF dual-hosted git repository.
kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 99d6ed2 NIFI-6352: Add ability to report all component metrics to
Prometheus
99d6ed2 is described below
commit 99d6ed244cd8808646eaa9fbf446e4be36defafc
Author: Matthew Burgess
AuthorDate: Wed Jun 5 12:32:22 2019 -0400
NIFI-6352: Add ability to report all component metrics to Prometheus
This closes #3519.
Signed-off-by: Kevin Doran
---
.../prometheus/PrometheusReportingTask.java| 32 +-
.../reporting/prometheus/PrometheusServer.java | 11 +-
.../prometheus/api/PrometheusMetricsUtil.java | 330 -
.../prometheus/TestPrometheusReportingTask.java| 4 +-
4 files changed, 296 insertions(+), 81 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/src/main/java/org/apache/nifi/reporting/prometheus/PrometheusReportingTask.java
b/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/src/main/java/org/apache/nifi/reporting/prometheus/PrometheusReportingTask.java
index daaddd3..7dcfe73 100644
---
a/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/src/main/java/org/apache/nifi/reporting/prometheus/PrometheusReportingTask.java
+++
b/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/src/main/java/org/apache/nifi/reporting/prometheus/PrometheusReportingTask.java
@@ -40,6 +40,10 @@ import org.apache.nifi.ssl.RestrictedSSLContextService;
import org.apache.nifi.ssl.SSLContextService;
import org.eclipse.jetty.server.Server;
+import static
org.apache.nifi.reporting.prometheus.api.PrometheusMetricsUtil.METRICS_STRATEGY_COMPONENTS;
+import static
org.apache.nifi.reporting.prometheus.api.PrometheusMetricsUtil.METRICS_STRATEGY_PG;
+import static
org.apache.nifi.reporting.prometheus.api.PrometheusMetricsUtil.METRICS_STRATEGY_ROOT;
+
@Tags({ "reporting", "prometheus", "metrics", "time series data" })
@CapabilityDescription("Reports metrics in Prometheus format by creating
/metrics http endpoint which can be used for external monitoring of the
application."
+ " The reporting task reports a set of metrics regarding the JVM
(optional) and the NiFi instance")
@@ -59,7 +63,8 @@ public class PrometheusReportingTask extends
AbstractReportingTask {
+ "specified in the SSL Context Service");
public static final PropertyDescriptor METRICS_ENDPOINT_PORT = new
PropertyDescriptor.Builder()
-.name("Prometheus Metrics Endpoint Port")
+.name("prometheus-reporting-task-metrics-endpoint-port")
+.displayName("Prometheus Metrics Endpoint Port")
.description("The Port where prometheus metrics can be accessed")
.required(true)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
@@ -68,7 +73,8 @@ public class PrometheusReportingTask extends
AbstractReportingTask {
.build();
public static final PropertyDescriptor INSTANCE_ID = new
PropertyDescriptor.Builder()
-.name("Instance ID")
+.name("prometheus-reporting-task-instance-id")
+.displayName("Instance ID")
.description("Id of this NiFi instance to be included in the
metrics sent to Prometheus")
.required(true)
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
@@ -76,16 +82,27 @@ public class PrometheusReportingTask extends
AbstractReportingTask {
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
+public static final PropertyDescriptor METRICS_STRATEGY = new
PropertyDescriptor.Builder()
+.name("prometheus-reporting-task-metrics-strategy")
+.displayName("Metrics Reporting Strategy")
+.description("The granularity on which to report metrics. Options
include only the root process group, all process groups, or all components")
+.allowableValues(METRICS_STRATEGY_ROOT, METRICS_STRATEGY_PG,
METRICS_STRATEGY_COMPONENTS)
+.defaultValue(METRICS_STRATEGY_COMPONENTS.getValue())
+.required(true)
+.build();
+
public static final PropertyDescriptor SEND_JVM_METRICS = new
PropertyDescriptor.Builder()
-.name("Send JVM-metrics")
-.description("Send JVM-metrics in addition to the Nifi-metrics")
+.name("prometheus-reporting-task-metrics-send-jvm")
+.displayName("Send JVM metrics")
+.description("Send JVM metrics in addition to the NiFi metrics")
.allowableValues("true", "false")
.defaultValue("false")
.required(true)
.build();
public static final PropertyDescriptor SSL_CONTEXT = new
PropertyDe
[nifi-fds] 02/02: NIFI-6249 - put license headers back in package files.
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
commit 8c3cefe551fd77630373eddc2c923e52f95a258a
Author: Rob Fellows
AuthorDate: Fri Jun 7 16:18:50 2019 -0400
NIFI-6249 - put license headers back in package files.
This closes #30
Signed-off-by: Scott Aslan
---
package-lock.json | 16 +++-
package.json | 13 +
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/package-lock.json b/package-lock.json
index b073b00..b323fd0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,20 @@
{
+"//": "Licensed to the Apache Software Foundation (ASF) under one or more",
+"//": "contributor license agreements. See the NOTICE file distributed
with",
+"//": "this work for additional information regarding copyright
ownership.",
+"//": "The ASF licenses this file to You under the Apache License, Version
2.0",
+"//": "(the \"License\"); you may not use this file except in compliance
with",
+"//": "the License. You may obtain a copy of the License at",
+"//": "",
+"//": "http://www.apache.org/licenses/LICENSE-2.0";,
+"//": "",
+"//": "Unless required by applicable law or agreed to in writing,
software",
+"//": "distributed under the License is distributed on an \"AS IS\"
BASIS,",
+"//": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.",
+"//": "See the License for the specific language governing permissions
and",
+"//": "limitations under the License.",
"name": "nifi-fds",
-"version": "0.1.0",
+"version": "0.2.0-SNAPSHOT",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 166716b..f51f300 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,17 @@
{
+"//": "Licensed to the Apache Software Foundation (ASF) under one or more",
+"//": "contributor license agreements. See the NOTICE file distributed
with",
+"//": "this work for additional information regarding copyright
ownership.",
+"//": "The ASF licenses this file to You under the Apache License, Version
2.0",
+"//": "(the \"License\"); you may not use this file except in compliance
with",
+"//": "the License. You may obtain a copy of the License at",
+"//": "",
+"//": "http://www.apache.org/licenses/LICENSE-2.0";,
+"//": "",
+"//": "Unless required by applicable law or agreed to in writing,
software",
+"//": "distributed under the License is distributed on an \"AS IS\"
BASIS,",
+"//": "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.",
+"//": "See the License for the specific language governing permissions
and",
"//": "limitations under the License.",
"name": "nifi-fds",
"version": "0.2.0-SNAPSHOT",
[nifi-fds] branch master updated (605e950 -> 8c3cefe)
This is an automated email from the ASF dual-hosted git repository. scottyaslan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/nifi-fds.git. from 605e950 [NIFI-6263] theme links style color [NIFI-6263] update typography demo documentation new ae7cc16 NIFI-6249 - simplify usage for es6 applications new 8c3cefe NIFI-6249 - put license headers back in package files. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 28 ++--- package-lock.json | 2 +- platform/core/common/fds-common.module.js | 2 +- .../common/services/fds-storage.service.spec.js| 4 +- platform/core/core.testbed-factory.js | 2 +- .../confirm-dialog.component.spec.js | 4 +- platform/core/dialogs/fds-dialog.component.js | 4 +- .../core/dialogs/fds-dialogs.component.spec.js | 4 +- platform/core/dialogs/fds-dialogs.module.js| 6 +- platform/core/dialogs/services/dialog.service.js | 2 +- platform/core/flow-design-system.module.js | 4 +- platform/core/index.js | 70 ++ platform/core/package.json | 6 +- .../core/snackbars/coaster/coaster.component.js| 6 +- .../snackbars/coaster/coaster.component.spec.js| 4 +- platform/core/snackbars/fds-snackbar.component.js | 4 +- .../core/snackbars/fds-snackbar.component.spec.js | 4 +- platform/core/snackbars/fds-snackbars.module.js| 8 ++- .../core/snackbars/services/snackbar.service.js| 2 +- webapp/components/flow-design-system/fds-demo.js | 6 +- webapp/fds.js | 4 +- webapp/fds.module.js | 2 +- webapp/services/fds.service.js | 3 +- webpack.alias.js | 17 +- 24 files changed, 123 insertions(+), 75 deletions(-) create mode 100644 platform/core/index.js
[nifi-fds] 01/02: NIFI-6249 - simplify usage for es6 applications
This is an automated email from the ASF dual-hosted git repository.
scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
commit ae7cc16a9a97d50db32f7ee492f4c20d825250fb
Author: Rob Fellows
AuthorDate: Thu Jun 6 20:43:18 2019 -0400
NIFI-6249 - simplify usage for es6 applications
---
README.md | 28 ++---
package-lock.json | 14 -
package.json | 13
platform/core/common/fds-common.module.js | 2 +-
.../common/services/fds-storage.service.spec.js| 4 +-
platform/core/core.testbed-factory.js | 2 +-
.../confirm-dialog.component.spec.js | 4 +-
platform/core/dialogs/fds-dialog.component.js | 4 +-
.../core/dialogs/fds-dialogs.component.spec.js | 4 +-
platform/core/dialogs/fds-dialogs.module.js| 6 +-
platform/core/dialogs/services/dialog.service.js | 2 +-
platform/core/flow-design-system.module.js | 4 +-
platform/core/index.js | 70 ++
platform/core/package.json | 6 +-
.../core/snackbars/coaster/coaster.component.js| 6 +-
.../snackbars/coaster/coaster.component.spec.js| 4 +-
platform/core/snackbars/fds-snackbar.component.js | 4 +-
.../core/snackbars/fds-snackbar.component.spec.js | 4 +-
platform/core/snackbars/fds-snackbars.module.js| 8 ++-
.../core/snackbars/services/snackbar.service.js| 2 +-
webapp/components/flow-design-system/fds-demo.js | 6 +-
webapp/fds.js | 4 +-
webapp/fds.module.js | 2 +-
webapp/services/fds.service.js | 3 +-
webpack.alias.js | 17 +-
25 files changed, 122 insertions(+), 101 deletions(-)
diff --git a/README.md b/README.md
index a83185b..a8e277d 100644
--- a/README.md
+++ b/README.md
@@ -10,33 +10,15 @@ The demo application serves 2 main purposes
For developers not interested in building the FDS NgModule you can use **npm**
to install the distribution files.
```bash
-npm install @nifi-fds/core
+npm install @nifi-fds/core --save
```
-Clients will need to configure a few aliases within their preferred module
loader/javascript bundler:
-
+ ES6
```javascript
-const path = require('path');
-
-module.exports = {
-'@flow-design-system/core': path.resolve(__dirname,
'node_modules/@nifi-fds/core/flow-design-system.module.js'),
-'@flow-design-system/dialogs': path.resolve(__dirname,
'node_modules/@nifi-fds/core/dialogs/fds-dialogs.module.js'),
-'@flow-design-system/dialog-component': path.resolve(__dirname,
'node_modules/@nifi-fds/core/dialogs/fds-dialog.component.js'),
-'@flow-design-system/dialog-service': path.resolve(__dirname,
'node_modules/@nifi-fds/core/dialogs/services/dialog.service.js'),
-'@flow-design-system/confirm-dialog-component': path.resolve(__dirname,
'node_modules/@nifi-fds/core/dialogs/confirm-dialog/confirm-dialog.component.js'),
-'@flow-design-system/snackbars': path.resolve(__dirname,
'node_modules/@nifi-fds/core/snackbars/fds-snackbars.module.js'),
-'@flow-design-system/snackbar-component': path.resolve(__dirname,
'node_modules/@nifi-fds/core/snackbars/fds-snackbar.component.js'),
-'@flow-design-system/snackbar-service': path.resolve(__dirname,
'node_modules/@nifi-fds/core/snackbars/services/snackbar.service.js'),
-'@flow-design-system/coaster-component': path.resolve(__dirname,
'node_modules/@nifi-fds/core/snackbars/coaster/coaster.component.js'),
-'@flow-design-system/common/storage-service': path.resolve(__dirname,
'node_modules/@nifi-fds/core/common/services/fds-storage.service.js'),
-'@flow-design-system/common/animations': path.resolve(__dirname,
'node_modules/@nifi-fds/core/common/fds.animations.js')
-};
-```
+import { FdsCoreModule } from '@nifi-fds/core';
-Once you have configured your module loader, you can import the **Apache NiFi
Flow Design System** NgModule into your angular application.
+function AppModule() {}
-```javascript
-var fdsCore = require('@flow-design-system/core');
AppModule.prototype = {
constructor: AppModule
};
@@ -44,7 +26,7 @@ AppModule.prototype = {
AppModule.annotations = [
new ngCore.NgModule({
imports: [
-fdsCore,
+FdsCoreModule,
...
],
...
diff --git a/package-lock.json b/package-lock.json
index 2381f93..b073b00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,4 @@
{
-"//": "Licensed to the Apache Software Foundation (ASF) under one or more",
-"//": "contributor license agreements. See the NOTICE file distributed
with",
-"//": "this work for additional information regarding copyright
ownership.",
-"//": "The ASF licenses this file to You under the Apac
[jira] [Created] (MINIFI-499) Evaluate dependency sources
Aldrin Piri created MINIFI-499: -- Summary: Evaluate dependency sources Key: MINIFI-499 URL: https://issues.apache.org/jira/browse/MINIFI-499 Project: Apache NiFi MiNiFi Issue Type: Improvement Reporter: Aldrin Piri Assignee: Aldrin Piri As in NIFI-6323, performing a review of all dependency sources and upgrading references to HTTPS where possible/applicable. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[nifi-minifi-cpp] branch master updated: minificpp-773 Implemented Text rendering.
This is an automated email from the ASF dual-hosted git repository.
phrocker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 47b0413 minificpp-773 Implemented Text rendering.
47b0413 is described below
commit 47b041396d127ba08e8651a64f39b9c33fa3d593
Author: amarmer
AuthorDate: Tue Jun 4 14:07:00 2019 -0700
minificpp-773 Implemented Text rendering.
This closes #584.
Signed-off-by: Marc Parisi
---
.../windows-event-log/ConsumeWindowsEventLog.cpp | 131 ++---
.../windows-event-log/ConsumeWindowsEventLog.h | 14 ++-
2 files changed, 124 insertions(+), 21 deletions(-)
diff --git a/extensions/windows-event-log/ConsumeWindowsEventLog.cpp
b/extensions/windows-event-log/ConsumeWindowsEventLog.cpp
index afc6d87..fc07e0f 100644
--- a/extensions/windows-event-log/ConsumeWindowsEventLog.cpp
+++ b/extensions/windows-event-log/ConsumeWindowsEventLog.cpp
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include "io/DataStream.h"
#include "core/ProcessContext.h"
@@ -42,6 +43,10 @@ namespace nifi {
namespace minifi {
namespace processors {
+static std::string to_string(const wchar_t* pChar) {
+ return std::wstring_convert>().to_bytes(pChar);
+}
+
const std::string
ConsumeWindowsEventLog::ProcessorName("ConsumeWindowsEventLog");
core::Property ConsumeWindowsEventLog::Channel(
@@ -60,6 +65,14 @@ core::Property ConsumeWindowsEventLog::Query(
supportsExpressionLanguage(true)->
build());
+core::Property ConsumeWindowsEventLog::RenderFormatXML(
+ core::PropertyBuilder::createProperty("Render Format XML?")->
+ isRequired(true)->
+ withDefaultValue(true)->
+ withDescription("Render format XML or Text.)")->
+ supportsExpressionLanguage(true)->
+ build());
+
core::Property ConsumeWindowsEventLog::MaxBufferSize(
core::PropertyBuilder::createProperty("Max Buffer Size")->
isRequired(true)->
@@ -84,6 +97,9 @@ core::Relationship ConsumeWindowsEventLog::Success("success",
"Relationship for
ConsumeWindowsEventLog::ConsumeWindowsEventLog(const std::string& name,
utils::Identifier uuid)
: core::Processor(name, uuid),
logger_(logging::LoggerFactory::getLogger()) {
+ // Initializes COM for current thread, it is needed to MSXML parser.
+ CoInitializeEx(0, COINIT_APARTMENTTHREADED);
+
char buff[MAX_COMPUTERNAME_LENGTH + 1];
DWORD size = sizeof(buff);
if (GetComputerName(buff, &size)) {
@@ -93,9 +109,16 @@ ConsumeWindowsEventLog::ConsumeWindowsEventLog(const
std::string& name, utils::I
}
}
+ConsumeWindowsEventLog::~ConsumeWindowsEventLog() {
+ if (xmlDoc_) {
+xmlDoc_.Release();
+ }
+ CoUninitialize();
+}
+
void ConsumeWindowsEventLog::initialize() {
//! Set the supported properties
- setSupportedProperties({Channel, Query, MaxBufferSize,
InactiveDurationToReconnect});
+ setSupportedProperties({Channel, Query, RenderFormatXML, MaxBufferSize,
InactiveDurationToReconnect});
//! Set the supported relationships
setSupportedRelationships({Success});
@@ -121,7 +144,7 @@ void ConsumeWindowsEventLog::onTrigger(const
std::shared_ptr 0) {
lastActivityTimestamp_ = now;
@@ -134,14 +157,80 @@ void ConsumeWindowsEventLog::onTrigger(const
std::shared_ptr &context)
-{
+void ConsumeWindowsEventLog::createTextOutput(const MSXML2::IXMLDOMElementPtr
pRoot, std::wstringstream& stream, std::vector& ancestors) {
+ const auto pNodeChildren = pRoot->childNodes;
+
+ auto writeAncestors = [](const std::vector& ancestors,
std::wstringstream& stream) {
+for (size_t j = 0; j < ancestors.size() - 1; j++) {
+ stream << ancestors[j] + L'/';
+}
+stream << ancestors.back();
+ };
+
+ if (0 == pNodeChildren->length) {
+writeAncestors(ancestors, stream);
+
+stream << std::endl;
+ } else {
+for (long i = 0; i < pNodeChildren->length; i++) {
+ std::wstringstream curStream;
+
+ const auto pNode = pNodeChildren->item[i];
+
+ const auto nodeType = pNode->GetnodeType();
+
+ if (DOMNodeType::NODE_TEXT == nodeType) {
+const auto nodeValue = pNode->text;
+if (nodeValue.length()) {
+ writeAncestors(ancestors, stream);
+
+ std::wstring strNodeValue = static_cast(nodeValue);
+
+ // Remove '\n', '\r' - just substitute all whitespaces with ' '.
+ strNodeValue = std::regex_replace(strNodeValue,
std::wregex(L"\\s+"), L" ");
+
+ curStream << L" = " << strNodeValue;
+}
+
+stream << curStream.str() << std::endl;
+ } else if (DOMNodeType::NODE_ELEMENT == nodeType) {
+curStream << pNode->nodeName;
+
+const auto pAttributes = pNode->attributes;
+for (long iAttr = 0; iAttr < pAttributes->length; iAttr++) {
+ const auto pAttribute = pAttributes->item[iAttr];
+
+ curStream << L" " << pAttribute->nodeName << L'(' <<
static_cast<_bstr_t>(pAttr
[nifi-fds] branch master updated: [NIFI-6263] theme links style color [NIFI-6263] update typography demo documentation
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 605e950 [NIFI-6263] theme links style color [NIFI-6263] update
typography demo documentation
605e950 is described below
commit 605e9507a93e78dcdf80180ac578a4afff351cd0
Author: Scott Aslan
AuthorDate: Fri May 3 15:51:04 2019 -0400
[NIFI-6263] theme links style color
[NIFI-6263] update typography demo documentation
This closes #20
---
platform/core/common/styles/_links.scss| 35 +---
platform/core/theming/_all-theme.scss | 2 +
webapp/components/flow-design-system/fds-demo.html | 97 +++---
3 files changed, 56 insertions(+), 78 deletions(-)
diff --git a/platform/core/common/styles/_links.scss
b/platform/core/common/styles/_links.scss
index 1a5896d..e46bd1f 100644
--- a/platform/core/common/styles/_links.scss
+++ b/platform/core/common/styles/_links.scss
@@ -17,19 +17,28 @@
/* Links */
-body[fds] .link {
- color: $linkColor;
- font-size: 14px;
- text-decoration: none;
- line-height: 24px;
- cursor: pointer;
-}
+@mixin fds-links-theme($theme) {
+ $primaryColor: map-get(map-get($theme, primary), 500);
+ $primaryColorHover: map-get(map-get($theme, primary), 100);
+ $accentColor: map-get(map-get($theme, accent), 500);
+ $accentColorHover: map-get(map-get($theme, accent), 100);
-body[fds] .link:hover {
- text-decoration: underline;
-}
+ body[fds] {
+.link {
+ color: $accentColor;
+ font-size: 14px;
+ text-decoration: none;
+ line-height: 24px;
+ cursor: pointer;
+}
+
+.link:hover {
+ text-decoration: underline;
+}
-body[fds] .link .disabled {
- color: $linkColorDisabled;
- text-decoration: none;
+.link .disabled {
+ color: $linkColorDisabled;
+ text-decoration: none;
+}
+ }
}
diff --git a/platform/core/theming/_all-theme.scss
b/platform/core/theming/_all-theme.scss
index f19a91b..27682ca 100644
--- a/platform/core/theming/_all-theme.scss
+++ b/platform/core/theming/_all-theme.scss
@@ -23,6 +23,7 @@
@import '../common/styles/inputs';
@import '../common/styles/checkboxes';
@import '../common/styles/tables';
+@import '../common/styles/links';
// Create a theme.
@mixin fds-theme($theme) {
@@ -37,4 +38,5 @@
@include fds-input-element-theme($theme);
@include fds-checkboxes-theme($theme);
@include fds-tables-theme($theme);
+ @include fds-links-theme($theme);
}
diff --git a/webapp/components/flow-design-system/fds-demo.html
b/webapp/components/flow-design-system/fds-demo.html
index c5d0a44..2f16d1e 100644
--- a/webapp/components/flow-design-system/fds-demo.html
+++ b/webapp/components/flow-design-system/fds-demo.html
@@ -43,11 +43,11 @@ limitations under the License.
// other imports
...
new ngCore.NgModule({
-imports: [
-fdsCore,
-// (optional) Additional imports
- ],
- ...
+imports: [
+fdsCore,
+// (optional) Additional imports
+ ],
+ ...
})
]]>
@@ -73,87 +73,68 @@ limitations under the License.
Typography
-Angular Material provides https://material.io/guidelines/style/typography.html";
target="_blank">typography CSS classes you can use to create visual
consistency across your application.
-
-Note:
-Base font size is 10px for easy rem units (1.2rem =
12px). Body font size is 14px. sp = scalable pixels.
-
-Header Styles
-To preserve semantic structures, you can
optionally style the - heading
tags with the styling classes shown below:
-CSS:
+FDS provides typography CSS classes you
can use to create visual consistency across your application. Optionally style
tags with the classes shown below:
.mat-display-4
-Light 112px
+Display 4
.mat-display-3
-Regular 56px
+Display 3
.mat-display-2
-Regular 45px
+Display 2
.mat-display-1
-Regular 34px
+Display 1
.mat-headline
-Regular 24px
+Headline
[nifi-fds] branch master updated: [NIFI-5295] display fds version in demo app
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new c22e911 [NIFI-5295] display fds version in demo app
c22e911 is described below
commit c22e911af9204a433fcdad0d111bc7313100efe5
Author: Scott Aslan
AuthorDate: Thu Jun 6 23:39:50 2019 -0400
[NIFI-5295] display fds version in demo app
This closes #29
---
package.json | 2 +-
webapp/services/fds.service.js | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 085acad..f51f300 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"//": "See the License for the specific language governing permissions
and",
"//": "limitations under the License.",
"name": "nifi-fds",
-"version": "0.1.0",
+"version": "0.2.0-SNAPSHOT",
"scripts": {
"start": "./node_modules/http-server/bin/http-server --gzip -p 28080
.",
"build:webapp:bundle:development": "npm run webpack:development",
diff --git a/webapp/services/fds.service.js b/webapp/services/fds.service.js
index b07dc5a..3dfc39b 100644
--- a/webapp/services/fds.service.js
+++ b/webapp/services/fds.service.js
@@ -18,6 +18,7 @@
import { TdDataTableService } from
'@covalent/core/bundles/covalent-core.umd.min.js';
import { FdsDialogService } from '@flow-design-system/dialogs';
import { FdsSnackBarService } from '@flow-design-system/snackbars';
+import {version} from '../../package.json';
/**
* FdsService constructor.
@@ -34,7 +35,7 @@ function FdsService(tdDataTableService, fdsDialogService,
fdsSnackBarService) {
this.dataTableService = tdDataTableService;
// General
-this.title = 'Apache NiFi Flow Design System Demo';
+this.title = 'Apache NiFi Flow Design System Demo v' + version;
this.inProgress = true;
this.perspective = '';
}
[nifi-fds] branch master updated: [NIFI-6357] update snackbar icon location
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 5cf12c4 [NIFI-6357] update snackbar icon location
5cf12c4 is described below
commit 5cf12c4bf7f55726b5eb10ae8190228a44ac8653
Author: Scott Aslan
AuthorDate: Thu Jun 6 23:20:21 2019 -0400
[NIFI-6357] update snackbar icon location
This closes #28
---
platform/core/theming/snackbars/coaster/_coaster.component.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platform/core/theming/snackbars/coaster/_coaster.component.scss
b/platform/core/theming/snackbars/coaster/_coaster.component.scss
index 16545b1..432c4d6 100644
--- a/platform/core/theming/snackbars/coaster/_coaster.component.scss
+++ b/platform/core/theming/snackbars/coaster/_coaster.component.scss
@@ -43,7 +43,7 @@ fds-snackbar-title
mat-icon.mat-icon.mat-primary.material-icons {
.fds-coaster-icon {
position: absolute;
- top: 24px;
+ top: 19px;
left: 15px;
}
[nifi-fds] branch master updated: [NIFI-6358] update button group toggle focus overlay hover style
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 96fa575 [NIFI-6358] update button group toggle focus overlay hover
style
96fa575 is described below
commit 96fa575aa0f7a224bc475ce21d684cd89c41ddc0
Author: Scott Aslan
AuthorDate: Thu Jun 6 23:10:26 2019 -0400
[NIFI-6358] update button group toggle focus overlay hover style
This closes #27
---
platform/core/common/styles/_buttonToggles.scss | 4
1 file changed, 4 insertions(+)
diff --git a/platform/core/common/styles/_buttonToggles.scss
b/platform/core/common/styles/_buttonToggles.scss
index 9450a1e..2c5216b 100644
--- a/platform/core/common/styles/_buttonToggles.scss
+++ b/platform/core/common/styles/_buttonToggles.scss
@@ -53,6 +53,10 @@ body[fds] .expansion-panel-filter-toggle-group div {
line-height: normal;
}
+body[fds] .mat-button-toggle-checked .mat-button-toggle-focus-overlay {
+border-bottom: none;
+}
+
body[fds] .tab-toggle-group {
box-shadow: none !important;
border: none;
[nifi-fds] branch master updated: [NIFI-6300] gzip compress assets
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 75825b9 [NIFI-6300] gzip compress assets
75825b9 is described below
commit 75825b950d56947ce0b45899926d9bd969a110c7
Author: Scott Aslan
AuthorDate: Wed Jun 5 22:46:46 2019 -0400
[NIFI-6300] gzip compress assets
This closes #23
---
package-lock.json | 159 ++
package.json | 7 ++-
webpack.common.js | 6 +++
webpack.dev.js| 11 ++--
webpack.prod.js | 14 -
5 files changed, 189 insertions(+), 8 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 561dba8..2381f93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1376,6 +1376,12 @@
"integrity":
"sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
"dev": true
},
+"acorn-walk": {
+"version": "6.1.1",
+"resolved":
"https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz";,
+"integrity":
"sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+"dev": true
+},
"after": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz";,
@@ -2096,6 +2102,18 @@
"callsite": "1.0.0"
}
},
+"bfj": {
+"version": "6.1.1",
+"resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.1.tgz";,
+"integrity":
"sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==",
+"dev": true,
+"requires": {
+"bluebird": "3.5.1",
+"check-types": "7.4.0",
+"hoopy": "0.1.4",
+"tryer": "1.0.1"
+}
+},
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz";,
@@ -2639,6 +2657,12 @@
"integrity":
"sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
"dev": true
},
+"check-types": {
+"version": "7.4.0",
+"resolved":
"https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz";,
+"integrity":
"sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
+"dev": true
+},
"chokidar": {
"version": "2.1.5",
"resolved":
"https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz";,
@@ -3005,6 +3029,20 @@
}
}
},
+"compression-webpack-plugin": {
+"version": "2.0.0",
+"resolved":
"https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz";,
+"integrity":
"sha512-bDgd7oTUZC8EkRx8j0sjyCfeiO+e5sFcfgaFcjVhfQf5lLya7oY2BczxcJ7IUuVjz5m6fy8IECFmVFew3xLk8Q==",
+"dev": true,
+"requires": {
+"cacache": "11.3.2",
+"find-cache-dir": "2.1.0",
+"neo-async": "2.6.0",
+"schema-utils": "1.0.0",
+"serialize-javascript": "1.6.1",
+"webpack-sources": "1.3.0"
+}
+},
"concat-map": {
"version": "0.0.1",
"resolved":
"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";,
@@ -4101,6 +4139,12 @@
}
}
},
+"duplexer": {
+"version": "0.1.1",
+"resolved":
"https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";,
+"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+"dev": true
+},
"duplexify": {
"version": "3.7.1",
"resolved":
"https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz";,
@@ -4149,6 +4193,12 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
"dev": true
},
+"ejs": {
+"version": "2.6.1",
+"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz";,
+"integrity":
"sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
+"dev": true
+},
"electron-to-chromium": {
"version": "1.3.124",
"resolved":
"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz";,
@@ -5356,6 +5406,12 @@
"minimatch": "3.0.4"
}
},
+"filesize": {
+"version": "3.6.1",
+"resolved":
"https://registry.npmjs.org/filesi
[nifi-fds] branch master updated: [NIFI-6261] Create a mixin to leverage the theme color in the .td-data-table-cell classes.
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git
The following commit(s) were added to refs/heads/master by this push:
new 2139e8d [NIFI-6261] Create a mixin to leverage the theme color in the
.td-data-table-cell classes.
2139e8d is described below
commit 2139e8d0bd5ba06e40ca64ff66312d7e4c7e35af
Author: Scott Aslan
AuthorDate: Fri May 3 14:59:29 2019 -0400
[NIFI-6261] Create a mixin to leverage the theme color in the
.td-data-table-cell classes.
This closes #19
---
platform/core/common/styles/_tables.scss | 36
platform/core/theming/_all-theme.scss| 2 ++
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/platform/core/common/styles/_tables.scss
b/platform/core/common/styles/_tables.scss
index cc2af89..66ef764 100644
--- a/platform/core/common/styles/_tables.scss
+++ b/platform/core/common/styles/_tables.scss
@@ -54,12 +54,8 @@ body[fds] .td-data-table-row.selected {
}
body[fds] .td-data-table-row:hover {
- background-color: $grey6;
- border: 1px solid $blue-grey2;
-}
-
-body[fds] .td-data-table-cell .mat-icon-button {
- color: $linkColor;
+ background-color: $blue4;
+ border: 1px solid $blue3;
}
body[fds] .td-data-table-cell .mat-button,
@@ -84,13 +80,6 @@ body[fds] .td-data-table-cell
.mat-icon-button.badge[disabled] {
opacity: 0.3;
}
-body[fds] .td-data-table-column .fa-caret-up,
-body[fds] .td-data-table-column .fa-caret-down {
- color: $blue-grey1;
- font-size: 12px;
- margin-bottom: 2px;
-}
-
body[fds] td-paging-bar {
color: $grey3;
}
@@ -115,4 +104,25 @@ body[fds] div .td-data-table {
border-bottom: 2px solid $grey7;
border-right: 1px transparent;
border-left: 1px transparent;
+ display: flex;
+}
+
+@mixin fds-tables-theme($theme) {
+ $primaryColor: map-get(map-get($theme, primary), 500);
+ $primaryColorHover: map-get(map-get($theme, primary), 100);
+ $accentColor: map-get(map-get($theme, accent), 500);
+ $accentColorHover: map-get(map-get($theme, accent), 100);
+
+ body[fds] {
+.td-data-table-cell .mat-icon-button {
+ color: $accentColor;
+}
+
+.td-data-table-column .fa-caret-up,
+.td-data-table-column .fa-caret-down {
+ color: $accentColor;
+ font-size: 12px;
+ margin-bottom: 2px;
+}
+ }
}
diff --git a/platform/core/theming/_all-theme.scss
b/platform/core/theming/_all-theme.scss
index b3977f5..f19a91b 100644
--- a/platform/core/theming/_all-theme.scss
+++ b/platform/core/theming/_all-theme.scss
@@ -22,6 +22,7 @@
@import '../common/styles/menus';
@import '../common/styles/inputs';
@import '../common/styles/checkboxes';
+@import '../common/styles/tables';
// Create a theme.
@mixin fds-theme($theme) {
@@ -35,4 +36,5 @@
@include fds-menus-theme($theme);
@include fds-input-element-theme($theme);
@include fds-checkboxes-theme($theme);
+ @include fds-tables-theme($theme);
}
[nifi] branch master updated: NIFI-6218 Support setting transactional.id in PublishKafka/PublishKafkaRecord
This is an automated email from the ASF dual-hosted git repository.
ijokarumawak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new aefdc93 NIFI-6218 Support setting transactional.id in
PublishKafka/PublishKafkaRecord
aefdc93 is described below
commit aefdc9377cc00c82ab70d44da5effd42da63bb04
Author: Ferenc Szabó
AuthorDate: Tue Apr 16 16:49:52 2019 +0200
NIFI-6218 Support setting transactional.id in
PublishKafka/PublishKafkaRecord
Added new property to the processors. If it is empty, then the behaviour is
the same as before.
Adde unit test to check if KafkaProducer receives the new property.
Testing Done:
Unit tests.
Connecting to kafka and verifying transactionalId-s in kafka server log.
fixing review findings
This closes #3439.
Signed-off-by: Koji Kawamura
---
.../kafka/pubsub/KafkaProcessorUtils.java | 12 +++
.../kafka/pubsub/PublishKafkaRecord_0_11.java | 14 +++-
.../processors/kafka/pubsub/PublishKafka_0_11.java | 14 +++-
.../processors/kafka/pubsub/PublisherPool.java | 8 +++--
.../kafka/pubsub/KafkaProcessorUtilsTest.java | 41 ++
.../processors/kafka/pubsub/TestPublisherPool.java | 6 ++--
.../kafka/pubsub/KafkaProcessorUtils.java | 12 +++
.../kafka/pubsub/PublishKafkaRecord_1_0.java | 14 +++-
.../processors/kafka/pubsub/PublishKafka_1_0.java | 14 +++-
.../processors/kafka/pubsub/PublisherPool.java | 8 +++--
.../kafka/pubsub/KafkaProcessorUtilsTest.java | 41 ++
.../processors/kafka/pubsub/TestPublisherPool.java | 6 ++--
.../kafka/pubsub/KafkaProcessorUtils.java | 12 +++
.../kafka/pubsub/PublishKafkaRecord_2_0.java | 14 +++-
.../processors/kafka/pubsub/PublishKafka_2_0.java | 14 +++-
.../processors/kafka/pubsub/PublisherPool.java | 8 +++--
.../kafka/pubsub/KafkaProcessorUtilsTest.java | 41 ++
.../processors/kafka/pubsub/TestPublisherPool.java | 5 ++-
18 files changed, 258 insertions(+), 26 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
index 37c6599..9bc4917 100644
---
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
+++
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtils.java
@@ -25,7 +25,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
@@ -332,6 +334,16 @@ final class KafkaProcessorUtils {
}
/**
+ * Method used to create a transactional id Supplier for KafkaProducer
+ *
+ * @param prefix String transactional id prefix, can be null
+ * @return A Supplier that generates transactional id
+ */
+static Supplier getTransactionalIdSupplier(String prefix) {
+return () -> (prefix == null ? "" : prefix) +
UUID.randomUUID().toString();
+}
+
+/**
* Method used to configure the 'sasl.jaas.config' property based on
KAFKA-4259
*
https://cwiki.apache.org/confluence/display/KAFKA/KIP-85%3A+Dynamic+JAAS+configuration+for+Kafka+clients
*
diff --git
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/PublishKafkaRecord_0_11.java
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/PublishKafkaRecord_0_11.java
index 0815518..cdd37a6 100644
---
a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/PublishKafkaRecord_0_11.java
+++
b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-11-processors/src/main/java/org/apache/nifi/processors/kafka/pubsub/PublishKafkaRecord_0_11.java
@@ -62,6 +62,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
import java.util.regex.Pattern;
@Tags({"Apache", "Kafka", "Record", "csv", "json", "avro", "logs", "Put",
"Send", "Message", "PubSub", "0.11.x"})
@@ -219,6 +220,14 @@ public class PublishKafkaRecord_0_11 extends
AbstractProcessor {
.defaultValue("true")
.required(true)
.build();
+static final PropertyDescriptor TRANSACTIONAL_ID_PREFIX = ne
